Commit Graph

622 Commits

Author SHA1 Message Date
shuxin   zheng
9b6a007103 test dns-gate demo 2022-04-30 20:33:12 +08:00
shuxin   zheng
2dbba96b97 fixed one bugs in rfc1035.cpp and add one demo dns-gate for transfering DNS protocol. 2022-04-30 14:56:38 +08:00
zhengshuxin
376e2571d8 Release acl-master 3.5.2-0 & acl-libs 3.5.3-11 2022-04-24 17:21:29 +08:00
zhengshuxin
8ee6683cd2 optimize acl_master for managing more no-acl modules 2022-04-22 17:55:25 +08:00
zhengshuxin
b38d4707b6 acl_master can manage the services which were not written by acl service template. 2022-04-19 17:48:58 +08:00
zhengshuxin
540bfbe3d8 fixed bugs in redis migrating process 2022-04-16 13:47:03 +08:00
zhengshuxin
d9f0c8b5da remove some compiling options for MacOS 2022-04-11 19:09:39 +08:00
hailang
5ef96d62fe Merge remote-tracking branch 'origin/master' into dev_mac_support_cross_compilation 2022-04-10 17:29:58 +08:00
hailang
3ddff50476 mac support cross compile 2022-04-10 15:43:29 +08:00
zhengshuxin
62fad2d17b Don't crash if setsid() error in acl_master 2022-04-08 17:50:52 +08:00
zhengshuxin
ddb2232be8 modify service configure for fiber mode 2022-04-08 08:16:02 +08:00
zhengshuxin
9c8fc9dba4 master_fiber.cpp can be used in shared stack mode. 2022-04-06 18:21:51 +08:00
zhengshuxin
3a74c65d81 Merge branch 'master' of gitee:zsxxsz/acl into gitee-zsxxsz 2022-04-03 00:16:40 +08:00
郑树新
a9b4053454 test httpd_proxy 2022-04-03 00:16:05 +08:00
zhengshuxin
af816bd946 test httpd_proxy demo 2022-04-02 23:59:44 +08:00
zhengshuxin
7783529c47 test httpd_proxy demo 2022-04-02 23:48:10 +08:00
zhengshuxin
e9b62fdc14 fixed bugs in httpd_proxy demo 2022-04-02 16:31:12 +08:00
zhengshuxin
300de6b7e4 poll.c can support shared stack 2022-03-31 18:35:14 +08:00
zhengshuxin
1ced194a2b optimize the API epoll's hooking in fiber module 2022-03-22 15:55:58 +08:00
zhengshuxin
cf30060e4f add setParseBody() in HttpServletRequest class 2022-03-16 18:14:45 +08:00
zhengshuxin
69d5e8bd63 test closing fd in another fiber 2022-03-12 23:59:32 +08:00
zhengshuxin
6a9d69c1f3 test httpd_proxy for closing another fiber's fd 2022-03-03 19:22:48 +08:00
zhengshuxin
18979c88a5 optimize for closing fd in another fiber from the running fiber 2022-03-02 18:33:09 +08:00
zhengshuxin
a60dbd21e1 adding new feature that one fiber can close another fiber's fd 2022-03-01 19:02:05 +08:00
zhengshuxin
f940f2dca3 seperate read/write fiber for reading and writing process 2022-02-20 11:39:46 +08:00
郑树新
6139b0ef2f add httpd_proxy's project into acl_cpp_vc2019.sln 2022-02-17 21:13:40 +08:00
zhengshuxin
f93fe96ec1 optimize and test fiber module 2022-02-16 23:01:54 +08:00
zhengshuxin
d4a829102f test fiber 2022-02-16 18:16:58 +08:00
shuxin   zheng
56314c1fdf test httpd_proxy 2022-02-16 12:00:12 +08:00
郑树新
3fe4ad1a84 optimize and fixed bugs in fiber module when using IOCP event 2022-02-15 22:34:10 +08:00
shuxin   zheng
f32aea02f5 readd doWebsocket() API in HttpServlet class for being compatible with old applications 2022-02-11 10:35:18 +08:00
shuxin   zheng
c968da6825 fixed some bugs in websocket demo 2022-02-10 09:50:00 +08:00
root
a41327d992 build tests ok on Alpine 2022-01-27 20:47:28 +00:00
zhengshuxin
8d7cf5cdfc build samples ok on WSL ubuntu 2022-01-28 12:28:21 +08:00
root
edf0b72aa3 porting to Alpine Linux ok 2022-01-27 19:37:10 +00:00
shuxin   zheng
d7fa5eab36 test httpd_proxy demo 2022-01-24 18:36:08 +08:00
郑树新
b60bdf94cd test httpd_proxy 2022-01-19 23:47:53 +08:00
郑树新
94980730c2 build httpd_proxy demo on windows platform 2022-01-18 23:58:40 +08:00
郑树新
6caf0293a1 support vs2019 for the application project generated by wizard 2022-01-01 11:28:01 +08:00
zhengshuxin
001964c9fc fixed bugs in http_servlet class in app/wizard/tmpl. 2021-10-19 13:23:38 +08:00
zhengshuxin
77aa6ef7ea optimize packaging process 2021-09-25 18:11:39 +08:00
shuxin   zheng
c0e6d687fb add vc2019 project for wizard module 2021-05-26 14:55:23 +08:00
shuxin   zheng
2cfb441d47 add one http server demo 2021-03-26 10:19:39 +08:00
shuxin   zheng
ce4eefa5ba modify samples 2021-01-17 18:57:37 +08:00
shuxin   zheng
af40bef5b0 moify Makefile in wizard's tmpl 2020-09-07 14:17:29 +08:00
shuxin   zheng
2f8c86105e optimize servers template in app/wizard 2020-09-07 14:09:24 +08:00
shuxin   zheng
435e4ff4aa optimize app/wizard 2020-08-21 14:51:09 +08:00
unknown
d4313ab4f6 fixed some compiling error by vc2015 2020-08-06 18:14:31 +08:00
shuxin   zheng
1beda872e0 fixed demo compiling error 2020-08-06 17:46:26 +08:00
zhengshuxin
d800ca468e use MD compiling options for all vc projects 2020-08-06 15:42:37 +08:00
unknown
556ec95a93 modify projects 2020-08-06 14:13:31 +08:00
郑树新
a6976962cd fixed compiling error by vc2012 2020-07-26 16:28:16 +08:00
shuxin   zheng
4f2dd3649f rewrite redis_client_cluster/redis_command classes. 2020-07-20 11:21:47 +08:00
shuxin   zheng
e2a5a02661 remove cpp files from vc projects created by wizard 2020-06-30 16:50:15 +08:00
shuxin   zheng
3942464913 optimize http template for wizard 2020-06-30 16:33:42 +08:00
shuxin   zheng
2e486755f0 optimize http template for wizard app 2020-06-30 15:55:52 +08:00
shuxin   zheng
30887c2cfc remove unused header in http_service.cpp 2020-06-29 17:26:20 +08:00
shuxin   zheng
01cfeed532 optimize http service templates in wizard app 2020-06-29 17:17:56 +08:00
zhengshuxin
06b812a8a5 compiling http service templates ok on Linux 2020-06-29 14:42:23 +08:00
shuxin   zheng
112dcdbba3 rewrite http service templates in wizard 2020-06-29 14:34:16 +08:00
shuxin   zheng
103c597948 fixed compiling error in Makefile_fiber.in 2020-06-22 16:09:49 +08:00
zhengshuxin
69d8baf06c release 3.5.1-4 for the new rpm package 2020-06-05 18:15:34 +08:00
shuxin   zheng
79317f0965 change compiling flag "-Wno-extended-offsetof" to "-Wno-invalid-offsetof" for clang 2020-05-19 09:28:57 +08:00
zhengshuxin
da6fba53b3 modify one demo httpd_upload which can be ran on the control of acl master 2020-05-04 20:30:58 +08:00
zhengshuxin
00f819fcbe add lost file for one demo httpd_upload 2020-05-03 22:45:27 +08:00
shuxin   zheng
c4e5910e0b format master_ctl' output 2020-04-23 10:22:26 +08:00
shuxin   zheng
00187c3ef6 modify master_ctl's Makefile 2020-04-22 17:04:59 +08:00
zhengshuxin
c8f861fb26 change configur files' charset from gbk to utf8 2020-04-22 16:56:31 +08:00
shuxin   zheng
2774fdd17a modify install shells for acl_master 2020-04-22 09:37:13 +08:00
zhengshuxin
467664ed02 release acl 3.5.1 version 2020-01-09 10:48:04 +08:00
zhengshuxin
5e6457bdd2 update package version to 3.5.0-12 2020-01-09 09:45:14 +08:00
zhengshuxin
b698693b3c build ok for FreeBSD 2016-01-14 14:45:37 +08:00
zhengshuxin
9697f95b8f Revert "All source code have been changed to use utf8 charset with BOM header!"
This reverts commit 15d999759e.
2019-07-28 10:31:56 +08:00
zsxxsz
15d999759e All source code have been changed to use utf8 charset with BOM header! 2019-07-27 22:44:32 +08:00
zhengshuxin
7ad30b164f modify server template in wizard for supporting IPV6 2019-07-27 19:32:56 +08:00
zhengshuxin
473e8489ab change the configure files from wizard for supporting IPV6 2019-07-27 19:28:22 +08:00
郑树新
a62898e157 optimize jencode tool 2019-07-26 18:30:38 +08:00
郑树新
649b94dc41 format source code's charset 2019-07-26 17:27:39 +08:00
郑树新
e521847d3f optimize Jencode APP 2019-07-26 16:09:45 +08:00
郑树新
ac72131cac Jencode APP suppots adding BOM header in files. 2019-07-26 16:07:47 +08:00
zhengshuxin
b46daaeb66 Merge branch 'master' of github:zhengshuxin/acl into github-zsx-master 2019-07-26 09:15:55 +08:00
zhengshuxin
d6a9cd931f add one httpd_fiber_upload sample written by acl fiber for http uploading 2019-07-25 22:32:30 +08:00
zhengshuxin
f7ca513177 modify README.md of httpd_upload sample 2019-07-24 23:02:10 +08:00
zhengshuxin
295bc2d57e add README.md for httpd_upload sample 2019-07-24 22:54:51 +08:00
zhengshuxin
bfd0e5dd6f modify http_servlet.cpp in wizard 2019-07-20 17:00:56 +08:00
zhengshuxin
2f7700943b format code style. 2019-07-20 16:41:23 +08:00
zhengshuxin
23f97bdd4f HttpServletRequest won't discard body_parse_ and will read request body when user calls getJson/getXml. 2019-07-20 16:14:09 +08:00
zhengshuxin
63ff768277 master dispatch will start as default by setting master_prefork = 1 2019-07-18 10:02:52 +08:00
zsxxsz
6525ffd92f fixed bug in acl_vstream_read_peek3 when double reading data 2019-07-10 21:36:00 +08:00
zsxxsz
a2c7889455 fixed bugs in acl_atomic_int64_fetch_add/acl_atomic_int64_add_fetch in acl_atomic.c 2019-07-09 23:13:42 +08:00
zhengshuxin
0ffd933de4 acl_vstream_read_peek3 can read data to userspace buffer to decrease the data copying times. 2019-07-09 10:25:22 +08:00
zsxxsz
8117eb885e fixed compiling warning on Windows. 2019-07-08 22:28:47 +08:00
zhengshuxin
8280209e71 add acl_vstream_read_peek3 2019-07-08 22:08:26 +08:00
zhengshuxin
feaaa6b72d format c++ code style. 2019-07-08 11:49:19 +08:00
zhengshuxin
c5fbe9ede4 format c++ code style. 2019-07-07 13:27:58 +08:00
zhengshuxin
123328c1af remove unused comments 2019-06-24 13:06:06 +08:00
zhengshuxin
1fb167d560 remove some useless comments 2019-06-24 11:58:19 +08:00
zhengshuxin
9c126618f5 optimize redis_builder 2019-06-17 10:57:38 +08:00
zhengshuxin
c8e9497086 format c++ code style. 2019-06-17 10:51:28 +08:00
zhengshuxin
87bcb1379a compiling demo 2019-06-10 09:21:43 +08:00
zhengshuxin
4ffc3d2b35 compiling redis_builder 2019-06-10 09:15:12 +08:00
zhengshuxin
469accbc30 fixed bugs in redis_builder 2019-03-28 11:35:19 +08:00
zhengshuxin
87698216e0 fixed bugs in redis_builder for scanning redis keys 2019-03-28 11:20:05 +08:00
zsx
2f3038c1a4 add httpd_proxy sample. 2019-03-14 15:24:11 +08:00
zsx
71fc7510a2 prepare for releasing acl 3.4.2 version! 2019-03-09 14:12:34 +08:00
zsx
e82b63b025 format code style 2018-12-12 11:16:12 +08:00
zsx
9665f1a883 add udp_fatal_on_bind_error configure for acl_udp_server.c 2018-11-28 18:58:21 +08:00
zsx
08c00933dd fixed one bug in json builder 2018-11-15 18:17:26 +08:00
zsx
ef96a07b27 modify gson test samples. 2018-11-15 17:16:35 +08:00
zsx
efdb56b579 add ACL_EMFILE errno for UNIX/Windows. 2018-11-15 15:48:13 +08:00
zsx
c7e10ae8da log important commands's info from remote in order to find problem of the running status. 2018-11-15 15:43:29 +08:00
zsx
86b45b99f2 udp server is more stable. 2018-10-23 21:29:55 +08:00
zsx
1b69ade656 acl_master can handle master_reuseport from configure for udp server that the port should be bound by acl_master or the app service. 2018-10-23 15:40:39 +08:00
zsx
35221f528b change server template's configure. 2018-10-23 15:22:03 +08:00
zsx
b3deca8792 add defer_accept control in master_listen.cpp 2018-10-23 14:22:35 +08:00
zsx
ea3d71999a limit the core file's size and disable creating core when process is exiting. 2018-10-23 13:29:21 +08:00
zhengshuxin
6b3133e2ca bugfix: acl_master can't support UDP service on Centos whose version is below 7.x 2018-10-17 17:21:18 +08:00
zhengshuxin
8602d19660 test acl_master 2018-09-19 16:55:53 +08:00
zhengshuxin
65b284c1d6 test acl_master 2018-09-19 16:52:13 +08:00
zhengshuxin
955af9d1d4 addrs matching in acl_master 2018-09-19 16:48:40 +08:00
zsx
de4805a6c8 fixed one bug in acl_ifconf.c for checking the UNIX path for matching. 2018-09-17 18:44:27 +08:00
zsx
4e393625c0 delete unused files. 2018-09-17 14:26:46 +08:00
zsx
f15c17ae29 build ok for Mac 2018-09-17 14:20:45 +08:00
zsx
4a3ec4a288 supporting IPV6 2018-09-13 18:38:03 +08:00
zsx
e8fad9062a fixed some compiling warning 2018-08-08 11:45:37 +08:00
zsx
4dc4e2cb18 bugfix: json parse should not ignore string value begin with space 2018-08-03 11:04:36 +08:00
zsx
f3f8a5f007 add one sample for testing json serialization. 2018-08-02 23:13:38 +08:00
zsx
9d1c2e850b bugfix: json parser gson serialization can't handle empty array object. 2018-08-02 23:00:22 +08:00
zsx
6f304c64b6 fixed one bug in app/wizard/tmpl/http/http_servlet.cpp 2018-07-31 10:56:44 +08:00
zsx
0c7b9b420e bugfix: json's serialization can't support double type with the integer type;
feature: add methods in acl::string which can use std::string.
2018-07-24 18:45:51 +08:00
zsx
d2cfd71867 remove unused names 2018-05-07 09:49:50 +08:00
zsx
16d40465f8 acl_master: can save command info into log file. 2018-03-21 19:00:58 +08:00
zsx
76aa09c97f rpm package: move acl-master.json from acl-master to acl-tools 2018-03-15 15:00:08 +08:00
zsx
8aecd4b67b rm acl-tools package from CI. 2018-03-07 13:31:37 +08:00
zsx
6518e1c175 add master_ctld_version.h 2018-02-27 11:55:16 +08:00
zsx
8efd4a76d5 version control 2018-02-27 11:53:35 +08:00
zsx
a6515afd23 add master version control by web service from master_ctld 2018-02-27 11:24:15 +08:00
zsx
93a50ea074 add version for acl_master 2018-02-27 11:10:53 +08:00
zsx
5546b3a201 rpm version to 3.3.0-80 2018-02-26 13:22:12 +08:00
zsx
ebf55128ed master_guard.cf: using master_ctld.sock 2018-02-24 09:34:00 +08:00
zsx
e22b24942f acl_unix_listen.c: won't fatal when binding UNIX addr error 2018-02-24 09:19:01 +08:00
zsx
1fee0512ae acl_master: acl_master: lock file should be before starting services 2018-02-24 00:22:52 +08:00
zsx
fb91be02a7 acl_master: when starting, lock the specified file avoiding starting more than once;
master_guard: listening master_guard.sock other master_guard.sock@unix;
master_ctld: listening master_ctld.sock.
2018-02-23 23:35:31 +08:00
zsx
d8ab35a1ac serialize gson: should support the std::map object is optional 2018-02-22 11:50:24 +08:00
zsx
962c583a20 remove unused stdout showing 2018-02-22 11:10:35 +08:00
zsx
827e145290 gson rpc: make env be optional 2018-02-22 10:49:09 +08:00
zsx
a5e17f408d master_ctld: add UNIX domain listening avoiding be blocked by iptables 2018-02-22 10:09:35 +08:00
zsx
a1d56b6d82 remove unused configure item 2018-02-22 10:05:50 +08:00
zsx
95f27fb2c3 add logger_debug for saving net data 2018-02-12 19:44:53 +08:00
zsx
db00ae6f17 master_ctld: support GET for checking port if service is aliving 2018-02-12 15:47:57 +08:00
zsx
6b248b7587 acl_master release 3.3.0-70 2018-02-12 14:16:54 +08:00
zsx
f9d0ee85c2 acl-master release 3.3.0-70 2018-02-12 14:15:57 +08:00
zsx
8e73122b3a fomat source code of master 2018-02-08 09:37:42 +08:00
zhengshuxin
8b71bccf62 master tools are all ok! 2018-01-31 14:28:45 +08:00
zhengshuxin
e3ede2e89f Merge branch 'master' of https://github.com/zhengshuxin/acl 2018-01-31 12:32:16 +08:00
zhengshuxin
69bd929c34 master tools: fixed some problems on Cendos5.x 2018-01-31 12:31:12 +08:00
zsx
0cb42a8a0c master warning format: rename proc to path 2018-01-31 12:20:37 +08:00
zsx
75ce3962ef acl_master: master_conf.cpp check_xxx should be override after reloading services' configures. 2018-01-31 12:17:57 +08:00
zsx
1dbc76dbec fixed one bug in ipc_monitor.cpp. 2018-01-30 10:02:27 +08:00
zsx
d4036e4da0 master warning message can be delivered without master_notify_recipients specified. 2018-01-29 18:25:19 +08:00
zsx
6f42126f3a master_monitor for tcp service 2018-01-29 17:24:54 +08:00
zsx
6d51361b5c service_guard for tcp_service 2018-01-29 17:07:43 +08:00
zsx
afa740de9c service_guard for tcp_service 2018-01-29 17:03:05 +08:00
zsx
8dff32f40f service_guard for tcp_service 2018-01-29 16:51:24 +08:00
zsx
b5720deac5 for tcp service 2018-01-29 15:08:50 +08:00
zsx
4f0e22dfcc add tcp_service mode 2018-01-29 14:54:53 +08:00
zsx
f6939aa793 service_guard: can save services status. 2018-01-26 16:24:47 +08:00
zsx
ebd2c013f0 service_guard: there're bugs in service_node.cpp for using redis_zset::save. 2018-01-26 10:44:52 +08:00
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