diff --git a/Makefile b/Makefile index 61e0f646a..202c6c31b 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,7 @@ acl_master: all_lib @(cd app/master/tools/master_ctld; make $(MAKE_ARGS); make install) @(cd app/master/tools/master_ctl; make $(MAKE_ARGS); make install) @(cd app/master/tools/master_guard; make $(MAKE_ARGS); make install) + @(cd app/master/tools/master_monitor; make $(MAKE_ARGS); make install) packinstall: @(echo "") @@ -143,6 +144,7 @@ packinstall: @(cd app/master/tools/master_ctld; make install) @(cd app/master/tools/master_ctl; make install) @(cd app/master/tools/master_guard; make install) + @(cd app/master/tools/master_monitor; make install) @(cd lib_fiber; make) @echo "copying app/master/daemon/acl_master $(BIN_PATH)" @cp -f app/master/daemon/acl_master $(BIN_PATH) diff --git a/packaging/acl-libs.spec b/packaging/acl-libs.spec index 67893057d..610ec8aac 100644 --- a/packaging/acl-libs.spec +++ b/packaging/acl-libs.spec @@ -1,7 +1,7 @@ Summary: The powerful c/c++ library and server framework Name: acl-libs Version: 3.3.0 -Release: 61 +Release: 62 Group: System/Libs License: IBM URL: http://cdnlog-web.qiyi.domain @@ -76,10 +76,13 @@ fi /etc/init.d/master %changelog -* Fri Jan 23 2018 zhengshuxin@qiyi.com 3.3.0-61-20180123.19 +* Wed Jan 24 2018 zhengshuxin@qiyi.com 3.3.0-62-20180124.16 +- add master_monitor tool of acl_master + +* Tue Jan 23 2018 zhengshuxin@qiyi.com 3.3.0-61-20180123.19 - epoll_event.c should handle EPOLLERR|EPOLLHUP events. -* Fri Jan 23 2018 zhengshuxin@qiyi.com 3.3.0-60-20180123.16 +* Tue Jan 23 2018 zhengshuxin@qiyi.com 3.3.0-60-20180123.16 - master & master tools: support version manager * Fri Jan 19 2018 zhengshuxin@qiyi.com 3.3.0-59-20180119.10