From a5e17f408d01c5cc4402c12da258ba3b305db964 Mon Sep 17 00:00:00 2001 From: zsx Date: Thu, 22 Feb 2018 10:09:35 +0800 Subject: [PATCH] master_ctld: add UNIX domain listening avoiding be blocked by iptables --- app/master/tools/master_ctld/master_ctld.cf | 2 +- app/master/tools/master_guard/master_guard.cf | 3 ++- packaging/acl-libs.spec | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/master/tools/master_ctld/master_ctld.cf b/app/master/tools/master_ctld/master_ctld.cf index 4ddc3b28e..646a92c7d 100644 --- a/app/master/tools/master_ctld/master_ctld.cf +++ b/app/master/tools/master_ctld/master_ctld.cf @@ -15,7 +15,7 @@ service master_ctld { # 172.25.*.*:8290, 172.26.*.*:8290, 172.27.*.*:8290, \ # 172.28.*.*:8290, 172.29.*.*:8290, 172.30.*.*:8290, \ # 172.31.*.*:8290 - master_service = 127.0.0.1:8290 + master_service = 127.0.0.1:8290, master_ctld@unix # 服务监听为域套接口 # master_service = aio_echo.sock diff --git a/app/master/tools/master_guard/master_guard.cf b/app/master/tools/master_guard/master_guard.cf index 955020e07..e9bec2b78 100644 --- a/app/master/tools/master_guard/master_guard.cf +++ b/app/master/tools/master_guard/master_guard.cf @@ -63,7 +63,8 @@ service master_guard # trigger_delay_usec = 5000 # trigger_daemon_timeout = 1800 - master_ctld = 127.0.0.1:8290 +# master_ctld = 127.0.0.1:8290 + master_ctld = {install_path}/var/public/master_ctld@unix guard_manager = master.qiyi.domain:8390 # guard_manager = 127.0.0.1:8390 } diff --git a/packaging/acl-libs.spec b/packaging/acl-libs.spec index 5f587e71f..0ee641c9f 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: 73 +Release: 74 Group: System/Libs License: IBM URL: http://cdnlog-web.qiyi.domain @@ -83,6 +83,9 @@ fi %changelog +* Thu Feb 22 2018 zhengshuxin@qiyi.com 3.3.0-74-20180222.10 +- master_ctld: add UNIX domain listening avoiding be blocked by iptables. + * Mon Feb 12 2018 zhengshuxin@qiyi.com 3.3.0-73-20180212.15 - master_ctld: support GET for checking port if service is aliving