Commit Graph

830 Commits

Author SHA1 Message Date
zhengshuxin
4a26f2a830 toto.txt 2017-06-11 19:39:00 +08:00
zhengshuxin
a6ac74a445 move "setting ACL_MASTER_FLAG_STOPPING" to acl_master_service_stop 2017-06-11 17:53:22 +08:00
zhengshuxin
f824d9b28f fixed one bug that acl_master will crached when stopping a service which is configured master_prefork > 0. 2017-06-11 17:26:17 +08:00
郑树新
497fb467ba Merge pull request #7 from acl-dev/master
merge
2017-06-09 18:04:30 +08:00
郑树新
de717c2c84 Merge pull request #73 from zhengshuxin/master
Merge pull request #6 from acl-dev/master
2017-06-09 18:03:07 +08:00
Zhang Qiang
f06ebf33d9 bump to version 3.3.0-2 2017-06-09 10:00:37 +08:00
Zheng Shuxin
cb6f0e5d9a Merge branch 'master' of https://github.com/acl-dev/acl 2017-06-08 17:53:47 +08:00
Zheng Shuxin
1663d24904 add one in todo.txt 2017-06-08 17:52:24 +08:00
Zhang QIang
61f22f82e0 Merge pull request #74 from xiaoqiang0/master
master: init script fixes
2017-06-08 03:21:48 -05:00
Zhang Qiang
604c20a432 master: fix start failure issue 2017-06-08 16:19:03 +08:00
Zheng Shuxin
7cad599b6e fixed one master's bug 2017-06-08 15:54:29 +08:00
Zhang Qiang
51a347ec97 master: return 0 for status command 2017-06-08 15:49:03 +08:00
root
7817e3ac14 acl_master can start without any service. 2017-06-08 14:37:55 +08:00
Zhang Qiang
49e77cfa20 service: init.d script 2017-06-08 12:14:16 +08:00
root
181e0103e4 acl_master's rpm package is indepedent from acl libs 2017-06-07 15:50:45 +08:00
Zhang Qiang
17717cde03 packaging to RPM support
Usage:

 $ cd packaging
 $ make rpm
2017-06-06 19:19:10 +08:00
ubuntu14
3e26cdaf86 add circle.yml 2017-06-06 18:31:03 +08:00
ubuntu14
2726fd74e3 rename libacl-all to libacl_all 2017-06-06 17:41:53 +08:00
ubuntu14
78a2d462ae when building the all-in-one library including libacl.a, libprotocol.a and libacl_cpp.a, rename the library name to libacl-all.a 2017-06-06 17:34:52 +08:00
zhengshuxin
93619189f5 fixed compile error 2017-06-06 09:56:54 +08:00
ubuntu14
0a19476092 In acl_fiber_server.c, the init procedure was called in the main thread which weren't be limited by the fiber's stack size. 2017-06-06 09:26:14 +08:00
zhengshuxin
a519b02a99 Merge branch 'master' of https://github.com/acl-dev/acl 2017-06-05 12:22:49 +08:00
zhengshuxin
3612489a81 ACL_TOKEN support acl_foreach 2017-06-05 12:21:02 +08:00
郑树新
4bbbb46b2d Merge pull request #6 from acl-dev/master
merge from acl-dev
2017-06-03 23:53:46 +08:00
郑树新
e8b03121f7 Merge pull request #71 from zhengshuxin/master
Merge pull request #5 from acl-dev/master
2017-06-03 23:52:43 +08:00
zhengshuxin
6bfdac5843 add acl_token_tree_word_remove in acl_token_tree.c 2017-06-03 23:45:18 +08:00
郑树新
d5e8d93fcb Merge pull request #5 from acl-dev/master
merge
2017-06-03 18:15:01 +08:00
郑树新
2494139b64 Merge pull request #70 from zhengshuxin/master
Merge pull request #4 from acl-dev/master
2017-06-03 18:13:31 +08:00
zhengshuxin
423b9a07c2 add macro ACL_TOKEN_TREE_WORD_MATCH for fast search word in token tree 2017-06-03 18:12:02 +08:00
郑树新
76276876f1 Merge pull request #4 from acl-dev/master
merge from acl-dev/acl
2017-06-02 18:09:06 +08:00
郑树新
b1ef43d977 Merge pull request #69 from zhengshuxin/master
Merge pull request #3 from acl-dev/master
2017-06-02 18:08:08 +08:00
root
40954a1558 acl_master support SO_REUSEPORT in UDP mode. 2017-06-02 18:02:36 +08:00
ubuntu14
a2398dfd22 modify lib_acl.hpp 2017-06-02 15:48:38 +08:00
ubuntu14
8650854c43 modify lib_acl.hpp 2017-06-02 15:38:27 +08:00
zhengshuxin
78a7540a76 reorganize all the include headers. 2017-06-02 14:47:24 +08:00
akzi
3c806e0bef edit gitignore 2017-06-01 21:58:28 +08:00
fuwangqin
88317e8341 fix gson_helper.ipp gcc compile error 2017-06-01 16:02:51 +08:00
fuwangqin
d29109956c add std::set for gson_helper ,and add acl.props for vs2015 2017-06-01 15:55:48 +08:00
郑树新
e26bc4b350 Merge pull request #3 from acl-dev/master
merge
2017-05-31 15:03:30 +08:00
郑树新
e9baa38f57 Merge pull request #68 from zhengshuxin/master
Merge pull request #2 from acl-dev/master
2017-05-31 15:02:12 +08:00
root
3d6aeda17c Merge branch 'master' of https://github.com/acl-dev/acl 2017-05-31 14:59:10 +08:00
root
5922aaaec9 delete unused files. 2017-05-31 14:58:30 +08:00
fuwangqin
4f61be3181 fix make error 2017-05-31 14:57:05 +08:00
郑树新
dc0e903b2f Merge pull request #2 from acl-dev/master
merge
2017-05-31 14:50:32 +08:00
root
0707afa35f add WebSocketServlet by "fuwangqin" <niukey@qq.com> 2017-05-31 14:43:18 +08:00
郑树新
e5c39cb5c8 Merge pull request #67 from zhengshuxin/master
Merge pull request #1 from acl-dev/master
2017-05-31 12:57:45 +08:00
root
d91b82abfb merge 2017-05-31 12:55:36 +08:00
郑树新
6e8c263024 Merge pull request #1 from acl-dev/master
merge
2017-05-31 12:52:29 +08:00
root
7d3de8e346 delete unused files. 2017-05-31 12:51:17 +08:00
root
d230265d3d Merge branch 'master' of https://github.com/acl-dev/acl 2017-05-31 12:48:59 +08:00