Commit Graph

454 Commits

Author SHA1 Message Date
zsx
2242fd58aa service_guard: save all services in one key of redis 2018-01-25 15:34:57 +08:00
zsx
a52f17f609 master_ctld: add default checking items. 2018-01-25 12:38:07 +08:00
zsx
98d0df51d8 service_struct.h: cmd should be optional. 2018-01-25 12:10:41 +08:00
zsx
02ccf4452d master_guard/service_guard: support checking memory of services. 2018-01-25 11:43:07 +08:00
zsx
1c1e079058 add configure item for master_monitor.cf 2018-01-24 23:56:00 +08:00
zsx
c601cbe157 restore master_guard's configure 2018-01-24 23:52:58 +08:00
zsx
a500d77a65 master_monitor can handle dead info of services 2018-01-24 23:48:48 +08:00
zsx
43aa4ee7c2 add building master_monitor in master's tools 2018-01-24 23:26:28 +08:00
zsx
73a393e1a2 service_guard can handle info of service's crashed. 2018-01-24 23:24:03 +08:00
zsx
3c6ead3d72 acl_master's web interface: add some checking items 2018-01-24 22:10:30 +08:00
zsx
96725dc2ff delete tmp file of master_monitor. 2018-01-24 16:45:34 +08:00
zsx
440cc26148 modify Makefile of master tools & lib_global 2018-01-24 16:44:48 +08:00
zsx
cda4511667 add master_monitor tools 2018-01-24 16:44:38 +08:00
zsx
b7b09bc2a6 modify json format 2018-01-24 16:10:19 +08:00
zsx
8619d4db42 move json path to lib_global 2018-01-24 16:00:02 +08:00
zsx
f1f640f65c add master tools 2018-01-24 15:55:50 +08:00
zsx
4fc5db521c add global lib for all master's tools 2018-01-24 15:10:00 +08:00
zsx
d384dce04e master_guard: add all info for version 2018-01-23 19:46:45 +08:00
zsx
ea244a6673 master & master tools can display the version of all services 2018-01-23 18:57:29 +08:00
zsx
fc0b189189 master_ctld: don't save all information by default 2018-01-19 10:24:55 +08:00
zsx
78beb49c5d acl_master: don't save some log information 2018-01-19 10:16:14 +08:00
zsx
f63a1d9408 master_ctld.cf: just listen 127.0.0.1:8290 by default 2018-01-19 09:53:12 +08:00
zsx
e9606ac8bc acl_ifconf_search can match TCP/UDP/UNIX domain socket addr automaticly 2018-01-16 13:55:55 +08:00
zsx
e7adfbb169 bugfix: fixed bugs in acl_ifconf.c's acl_ifconf_search and acl_udp_server.c 2018-01-16 11:43:35 +08:00
zsx
c9a11e6a29 acl_master: remove ACL_MASTER_SERV:command avoding misusing it, just using path 2018-01-05 10:40:05 +08:00
zsx
7213e116e3 service_guard: store date in redis with human-readable format 2018-01-04 18:19:00 +08:00
zsx
622c9d76e3 modify service_guard's configure 2018-01-04 15:37:20 +08:00
zsx
1c12b4f4b5 master's tools: add service_guard for managing all master_guards 2018-01-04 15:13:48 +08:00
zsx
6e119b3842 use the json struct same with service_guard/json 2018-01-04 15:11:37 +08:00
zsx
d3eb31424f master_guard: using some function in daemon/json 2018-01-04 11:10:24 +08:00
zsx
a2104bfba8 compiling error on CS6.4 2018-01-03 23:23:04 +08:00
zsx
009e895d41 add master_guard in master/tools 2018-01-03 23:06:27 +08:00
zsx
dc21d58218 master: add lost item named start in service_list.cpp 2018-01-03 18:59:37 +08:00
root
01be5a98c6 acl_udp_server: can exit gracefully 2018-01-03 02:54:53 +08:00
zsx
461afed4c7 Makefile_fiber.in: -lfiber should be after -lacl 2017-12-27 17:07:06 +08:00
zsx
92fdf8b1d4 redis builder: all commands support auth. 2017-12-27 10:26:06 +08:00
zsx
434c2a2970 master: when master can't bind one addr master maybe crash for one object been freed before. 2017-12-25 16:30:34 +08:00
zsx
b7c42290f7 master: master can't restart service when updating service command by master_ctl command 2017-12-22 16:07:32 +08:00
zsx
43e3aeee3c master: fixed bugs in master when reload services 2017-12-22 14:56:59 +08:00
zsx
4f0e2cc8dd feature: master can bind udp with unix domain path 2017-12-12 19:18:33 +08:00
zsx
fa113a12e7 acl stream and servers support UNIX domain socket in UDP packet mode 2017-12-10 22:23:37 +08:00
zsx
e65bdd10bf master: using acl_ifconf_search in service_sock & service_udp 2017-12-10 11:27:18 +08:00
zsx
01fcb0356e services's configure files update 2017-12-08 10:20:27 +08:00
zsx
b5ba4057db charset: changed main.cf's charset from gbk to utf-8 2017-12-08 09:50:22 +08:00
zsx
a5b15ee15b master: changed service_throttle_time from 60 to 10 in main.cf 2017-12-05 15:19:29 +08:00
zsx
318a2af3e7 master_ctld.conf add internal IP list 2017-12-03 23:53:46 +08:00
ruki
a65c0a3484 add some xmake.lua for app 2017-12-01 09:10:16 +08:00
ruki
987385ea6e add xmake.lua 2017-11-30 10:04:15 +08:00
zsx
41d76c8a04 master: can start service with extname of command 2017-11-21 17:40:25 +08:00
zsx
a8d8f40b52 master: can start & restart one service with different extname that maybe be used for different service version 2017-11-21 16:46:39 +08:00
zsx
be83030d8d master: add master_config command to get master's configure info. 2017-11-21 12:43:34 +08:00
zhengshuxin
b2b6521a75 compiling error on CentOS6.x 2017-11-16 11:37:57 +08:00
zhengshuxin
3e5a449310 master: upgrade version 2017-11-13 09:51:41 +08:00
zhengshuxin
65b1bb2162 master: update vertion to 2.0 2017-11-13 09:37:54 +08:00
zhengshuxin
e86ae675ae master: kill&stop one child with the specified configure file. 2017-11-12 20:41:16 +08:00
zhengshuxin
d4fb931056 code style format 2017-11-12 18:32:08 +08:00
zhengshuxin
8c70aae5fa master: master should not fork child process after starting service failed. 2017-11-12 18:27:27 +08:00
zhengshuxin
ef7e4495ac master: can start services specified in configure file. 2017-11-12 00:20:15 +08:00
zhengshuxin
48f00140a4 master_ctl: add waiting timeout arg of one command 2017-11-07 13:33:33 +08:00
zhengshuxin
e7800ce7c9 master_ctl: support using readline optional. 2017-11-07 13:25:54 +08:00
zhengshuxin
76889c5b35 master: supporting start service with absolute path 2017-11-07 11:54:12 +08:00
zhengshuxin
b7c6384b1e fixed one compiling error 2017-10-27 14:15:42 +08:00
zhengshuxin
db886f9d62 master: all server template support waiting the service starting status 2017-10-27 11:38:10 +08:00
zhengshuxin
bc4f60a2d3 acl_master: when starting services remotely, users can wait the result of the services' starting status or not. 2017-10-27 00:00:41 +08:00
zhengshuxin
0060ea9487 add service status type header 2017-10-26 22:00:14 +08:00
zhengshuxin
b998731976 building: modify Makefiles to build more quickly on multi-cores CPU 2017-10-10 10:19:59 +08:00
zhengshuxin
0f08451aa6 master: format c++ code style. 2017-09-24 21:10:28 +08:00
zhengshuxin
73fdae6530 acl_master's manage: restructure manage web module 2017-09-22 18:05:34 +08:00
zhengshuxin
7f41de209f modify protocol.md 2017-09-19 15:45:08 +08:00
zhengshuxin
7335f2a449 add master's web protocol in markdown file 2017-09-19 15:40:01 +08:00
zhengshuxin
dbea17b59d add configure items into server templates' configures 2017-09-11 22:34:56 +08:00
zhengshuxin
32dede69de add reload_timeout into main.cf of acl_master 2017-09-11 14:28:22 +08:00
zsx
cb1c642461 build ok for Macosx 2017-07-17 17:53:56 +08:00
zhengshuxin
5101ef3cc6 reload timeout can be set in acl_master 2017-09-10 17:54:07 +08:00
zhengshuxin
f17a0cd32e modify configure content of server templates used by wizard 2017-09-10 17:39:51 +08:00
zhengshuxin
5f3c319078 master can wait for the callback from children after reloading the specific service's children 2017-09-09 23:05:33 +08:00
zhengshuxin
a67e6a6338 sighup's result status from children can be got by acl_master 2017-09-09 00:30:39 +08:00
zhengshuxin
3d406e7277 init_conf_str_vars in master_params.cpp has memory leak when master reload configure. 2017-09-06 22:03:27 +08:00
zhengshuxin
965ecddd16 remove watchdog from master's main.cpp 2017-09-06 13:31:12 +08:00
zhengshuxin
025a9b29f2 make master's reload safety 2017-09-06 13:19:49 +08:00
zhengshuxin
296d5a995d master can wait until the children exited 2017-09-05 23:47:48 +08:00
zhengshuxin
3d02c72328 all master templates support handling SIGTERM signal. 2017-09-05 10:58:55 +08:00
zhengshuxin
dd9eed4698 compiling acl ok on FreeBSD 2015-12-13 10:15:00 +08:00
zsxxsz
4afb237dd9 fixed compiling error by vc 2017-09-02 09:42:11 +08:00
zhengshuxin
5291cd0c7a test only 2017-09-01 18:59:42 +08:00
zhengshuxin
25d33da4de when acl was installed into system by using rpm, the logger's compiling warn wasn't useful. 2017-09-01 17:43:12 +08:00
zhengshuxin
7fbebad954 make master more safety for invalid configue in app service. 2017-08-11 12:15:00 +08:00
zhengshuxin
c3bf4f6b1b add some values in get_bool_ent 2017-08-11 11:38:44 +08:00
zhengshuxin
fe44b078fc TCP_FASTOPEN can be used by setting the master_fastopen item in servers' configure files 2017-08-10 11:46:02 +08:00
zhengshuxin
1915852bd9 SO_REUSEPORT can be used in master server framework by setting configure item 2017-08-10 11:35:52 +08:00
zhengshuxin
b48627f168 add -ldl in some Makefile.in 2017-08-07 12:04:56 +08:00
zhengshuxin
e40c8bfb1a add -ldl in app's Makefile 2017-08-07 11:29:19 +08:00
zhengshuxin
b0b08bf3ef put master_ctl into rpm package. 2017-08-01 13:41:36 +08:00
zhengshuxin
6075440fb2 add main.cf into master/daemon/ path 2017-07-31 14:14:33 +08:00
zhengshuxin
d0024f25e7 for build rpm packing 2017-07-31 14:10:40 +08:00
zhengshuxin
c61af177c6 for build rpm 2017-07-31 14:00:04 +08:00
zhengshuxin
d0b71fb3a4 add master_ctld to rpm package. 2017-07-31 13:51:34 +08:00
zsxxsz
40a571f0fb fixed compiling error on windows. 2017-07-25 22:24:50 +08:00
zhengshuxin
9629b2ca1d make the output of master_ctl looks more beautiful:) 2017-07-24 22:42:11 +08:00
zhengshuxin
b8237e011b add starting time in master management protocol. 2017-07-24 16:06:29 +08:00
zhengshuxin
75443ef214 remove readline dependence by master_ctld 2017-07-24 09:34:13 +08:00
zhengshuxin
738f1c7124 move master_dispatch to master/tools/ directory. 2017-07-23 08:43:02 +08:00
zhengshuxin
e77c3bdfcd changed check_disabled to enabled 2017-07-23 08:25:35 +08:00
zhengshuxin
93b3250ca5 add methods that get configure path 2017-07-22 21:32:21 +08:00
zhengshuxin
8506208468 optimize some codes. 2017-07-22 19:42:19 +08:00
zhengshuxin
bc1d01b069 combine all actions into one. 2017-07-22 18:08:23 +08:00
zhengshuxin
072b9b7812 modify master_ctl 2017-07-21 17:25:35 +08:00
zhengshuxin
fc3970d0b4 all commands of master management are ok! 2017-07-21 15:38:28 +08:00
zhengshuxin
9ff0659332 fixed one compiling warning in gcc7.1.0 2017-07-21 12:26:52 +08:00
zhengshuxin
0b431ee4e8 add service restart web interface in acl_master and master's tools 2017-07-21 12:17:02 +08:00
zhengshuxin
93350e7f86 change list command json format for managing acl_master 2017-07-21 11:57:23 +08:00
zhengshuxin
e8721ebfa9 make master_ctl's output looks beautiful. 2017-07-21 10:14:20 +08:00
zhengshuxin
4222f4618d delete tmp file. 2017-07-21 10:08:33 +08:00
zhengshuxin
1fce66afd5 make master_ctl's output looking more beautiful with different colors. 2017-07-21 09:37:13 +08:00
zhengshuxin
385c53892a add master_ctld which can control acl_master in service's mode. 2017-07-20 23:26:51 +08:00
zhengshuxin
1eeb4cca42 add users's acl. 2017-07-17 21:37:32 +08:00
zsx
7625db478b disable rl_clear_screen of master_ctl on MacOSX 2017-07-17 16:29:04 +08:00
zhengshuxin
54c30076ff master_ctl is ok! 2017-07-17 16:19:46 +08:00
zhengshuxin
66a35c5837 add configure item in master's protocol;
fixed warning on MACOSX
2017-07-17 15:30:52 +08:00
zsx
7e8c42c506 fixed some compiling error on MacOS 2017-07-17 10:10:46 +08:00
zhengshuxin
88eb449328 udp server template can be created with joinable mode. 2017-07-10 12:22:09 +08:00
zhengshuxin
4a60b1217c add service_kill class for acl_master management 2017-07-07 16:57:39 +08:00
郑树新
2b9f532975 add graceful STOPPING web interface for acl_master's management. 2017-07-07 15:36:40 +08:00
郑树新
24df82f84c fixed one compiling error in redis_cluster sample 2017-07-06 09:57:23 +08:00
zhengshuxin
dcff42768a use poll in acl_master other than select or epoll. 2017-07-05 14:53:40 +08:00
zhengshuxin
99660d0734 add proc_on_bind in master_udp class 2017-07-05 14:31:18 +08:00
zhengshuxin
98d11361bb test sighup callback ok for all server template. 2017-07-05 10:27:33 +08:00
zhengshuxin
3057fd64d9 add master_ctl tool which can notify acl_master to list/stat/start/stop/reload one or more services. 2017-07-03 19:26:36 +08:00
zhengshuxin
128df49e08 fixed bugs in acl_atomic.c 2017-07-03 17:42:55 +08:00
Zheng Shuxin
d52e8c5113 modify lib_fiber module 2017-07-03 16:00:05 +08:00
Zheng shuxin
698bc770ec acl_master supports reload 2017-06-28 10:47:15 +08:00
Zheng shuxin
f973f28492 modify master service 2017-06-27 17:11:04 +08:00
Zheng shuxin
a731cf5507 linked master_service's all processes. 2017-06-26 14:46:21 +08:00
Zheng shuxin
15e6ea1fa6 add read timeout for client connection 2017-06-26 13:19:43 +08:00
Zheng shuxin
d9fbd9c650 changed the web protocol for management 2017-06-26 12:34:23 +08:00
zhengshuxin
ecbfa37cc2 acl_master uses kernel event engine. 2017-06-25 11:46:43 +08:00
zhengshuxin
6aef271bcf wizard's Makefile 2017-06-25 11:21:09 +08:00
Zheng Shuxin
3de2af54e4 fixed bug in master_listen.cpp 2017-06-23 12:30:57 +08:00
Zheng Shuxin
3c86372490 modify acl_udp_server.c 2017-06-22 12:21:54 +08:00
ubuntu14
7ed6180b33 udp server support multi threads mode 2017-06-21 18:31:37 +08:00
Zheng Shuxin
bcecf2cfef Merge branch 'master' of https://github.com/acl-dev/acl 2017-06-20 15:41:41 +08:00
Zheng Shuxin
1c2597cb19 fixed one bug in redis_commands.cpp 2017-06-20 15:41:04 +08:00
ubuntu14
85f1db0b38 acl_udp_sever.c can bind addrs matching some pattern 2017-06-20 14:07:45 +08:00
zhengshuxin
cf9933ffcf redis_builder can check readline/ncurses libs in /lib64 path. 2017-06-19 11:00:22 +08:00
zhengshuxin
28d76fa279 add acl_master_delete_all_children for stopping acl_master in Docker's running time. 2017-06-18 21:46:52 +08:00
zhengshuxin
6007a77c17 fixed one bug in redis_builder 2017-06-18 18:32:19 +08:00
ubuntu14
1d37af541a add test data for acl_master's web service 2017-06-16 17:14:44 +08:00
ubuntu14
21cfa62a49 acl_master adds web interface. 2017-06-16 17:00:49 +08:00
zhengshuxin
ce4c48f8b3 gson's samples 2017-06-16 12:47:00 +08:00
fuwangqin
0a1d0297e2 fix struct.stub error in app/gson/demo 2017-06-16 11:51:10 +08:00
ubuntu14
20c735c0df master support web interface 2017-06-15 15:38:00 +08:00
ubuntu14
dfbb553f01 adding http interface for acl_master 2017-06-15 11:28:01 +08:00
fuwq
3f55fa31ed Merge pull request #76 from akzi/master
add set support for gson
2017-06-15 00:23:04 +08:00
ubuntu14
b871a1b70d add manage dir 2017-06-14 17:42:05 +08:00
ubuntu14
1dc2eab9fe rm manager dir 2017-06-14 17:41:12 +08:00
fuwangqin
f1ac0703ef add set support in Gson. and fix potemtial bug in gson_helper.ipp 2017-06-14 13:55:05 +08:00
zhengshuxin
d2b6e07362 move acl master's daemon to master 2017-06-13 21:56:56 +08:00
zhengshuxin
65cd3b94ff rm master dir 2017-06-13 21:55:40 +08:00
zhengshuxin
2ff4abdbef remove unused stdafx.h 2017-06-12 23:46:19 +08:00
zhengshuxin
0b30d83329 move acl_master to app from lib_acl 2017-06-12 23:19:56 +08:00
zhengshuxin
78a7540a76 reorganize all the include headers. 2017-06-02 14:47:24 +08:00
fuwangqin
d29109956c add std::set for gson_helper ,and add acl.props for vs2015 2017-06-01 15:55:48 +08:00
root
d91b82abfb merge 2017-05-31 12:55:36 +08:00
root
b9440151d6 Merge branch 'master' of https://github.com/acl-dev/acl 2017-05-31 09:02:04 +08:00
zhengshuxin
dfeef3a6bf fiber service can exit until all the clients are closed, specified by configure. 2017-05-16 23:22:07 +08:00
zhengshuxin
8b0c600fac fixed bugs in gson_helper.ipp for object's pointer copy 2017-05-14 00:16:42 +08:00
zhengshuxin
29f3ef3b73 supporting for IPV6 2017-04-11 23:14:39 +08:00
zhengshuxin
57f8afc403 modify acl Makefiles to renaming lib names. 2017-03-25 23:05:44 +08:00
fuwangqin
6db8b204e8 gson add using namespace supported 2017-03-15 16:17:58 +08:00
zhengshuxin
d2128e6f70 add iconv app for files charset convert. 2017-03-13 22:57:46 +08:00
zhengshuxin
3cd0864746 supporting ios and can be compiled by xcode. 2017-03-12 14:49:48 +08:00
zhengshuxin
e5f7aa1b54 compile acl on MSYS. 2017-02-21 22:35:31 +08:00
ubuntu14
8af97f2576 delete unused sample. 2017-01-04 16:11:11 +08:00
zhengshuxin
2b7cd0a6bb gson support empty base struct object. 2017-01-04 13:39:09 +08:00
zhengshuxin
2eb4403b88 add one sample for gson object serialization. 2017-01-03 10:46:31 +08:00
zhengshuxin
03d36523e0 add acl_fiber_signal in lib_fiber. 2016-12-31 13:52:34 +08:00
郑树新
1e05dfb6c6 Merge pull request #52 from acl-dev/master
merge to acl
2016-12-30 17:22:20 +08:00
fuwangqin
1b81714531 add test std::map<> codes 2016-12-30 17:10:30 +08:00
zhengshuxin
06fa2499fa fixed bugs in lib_fiber; add features in http module. 2016-12-29 23:58:18 +08:00
zhengshuxin
1b6d166ef6 add acl_fiber_kill for fiber lib;
add listen callback for master template.
2016-12-03 20:09:21 +08:00
zhengshuxin
2b282d9f66 remove setting non-blocking in acl_vstream_fdopen. 2016-11-18 21:45:40 +08:00
zhengshuxin
be07157761 fixed one bug in acl_json.h for duplicate defined ACL_JSON_T_XXX 2016-10-21 17:22:40 +08:00
zhengshuxin
f30b2b4144 add some websocket samples(upload_server/upload_client); fixed some bugs in acl; 2016-10-21 15:02:50 +08:00
akzi
da4feafa1e add vector map field 2016-10-17 16:44:12 +02:00
zhengshuxin
b52ba569ec add one gson sample: test4 2016-10-17 22:23:21 +08:00
zhengshuxin
ec57cdb0b0 add one gson sample: test3 2016-10-17 16:59:27 +08:00
zhengshuxin
497123af7d add one test sample. 2016-10-16 20:22:26 +08:00
zhengshuxin
a8b08d7e16 the gson.cpp/gson.h files should be appened "\n" in the end of which. 2016-10-14 17:20:20 +08:00
dep
b0090e4ce1 C++ serialization module gson can support non C++11. 2016-10-14 15:11:13 +08:00
zhengshuxin
d4be6d4abb fixed one compiling warning. 2016-10-13 23:27:09 +08:00
zhengshuxin
fee1610ac4 gson support struct members' initialization, fixed one bug in json_node::get_text. 2016-10-13 16:15:38 +08:00
zhengshuxin
7de56bb938 rm test1 sample. 2016-10-13 15:55:15 +08:00
zhengshuxin
173b7e5cac add test samples for gson. 2016-10-13 15:35:09 +08:00
zhengshuxin
e1d747f6c1 move gson module into serialize directory. 2016-10-12 22:00:14 +08:00
zhengshuxin
7095f8a640 fixed bugs in gson_helper.ipp. 2016-10-11 22:04:45 +08:00
郑树新
a1510793bc Merge pull request #36 from acl-dev/master
Merge from acl
2016-10-11 21:03:20 +08:00
zhengshuxin
f0e5a302b3 fixed one bug in acl_json_build/acl_json_buiding bug when building a json object. 2016-10-11 20:58:37 +08:00
akzi
dc6139b45b add some code for test gson 2016-10-11 18:07:03 +08:00
akzi
f13011d790 fix gson vs project 2016-10-10 23:31:14 +08:00
zhengshuxin
0ad006d887 add test sample for gson. 2016-10-09 21:49:35 +08:00