acl_master supports signal the children processes with the specified signal numer

Author: zhengshuxin

app/master/daemon/master/master_spawn.cpp

@@ -593,8 +593,8 @@ void acl_master_signal_children(ACL_MASTER_SERV *serv, int sig, int *nsignaled)
 		*nsignaled = n;
 	}
 
-	acl_msg_info("%s: service %s, path %s, signal %d, children %d,"
-		" signaled %d", myname, serv->name, serv->path,
+	acl_msg_info("%s: service=%s, path=%s, signal=%d, children=%d,"
+		" signaled=%d", myname, serv->name, serv->path,
 		sig, acl_ring_size(&serv->children), n);
 }
 

app/master/daemon/version.h

@@ -2,7 +2,7 @@
 #define __MASTER_VERSION_INCLUDE_H__
 
 #define MASTER_NAME	"acl_master"
-#define MASTER_VERSION	"3.5.4-4"
-#define MASTER_DATE	"20220630"
+#define MASTER_VERSION	"3.5.4-5"
+#define MASTER_DATE	"20220704"
 
 #endif

app/master/doc/protocol.md

@@ -12,12 +12,13 @@
 
 请求协议：
 ```
-POST /?cmd=list HTTP/1.0
-Content-Length: 25
+POST /?cmd=list HTTP/1.1
+Host: localhost
+Content-Length: 24
 Connection: keep-alive
 Content-Type: text/json
 
-{ cmd: 'list', data: {}}
+{"cmd":"list","data":{}}
 ```
 
 响应协议：
@@ -26,7 +27,7 @@ HTTP/1.1 200 OK
 Date: Tue, 19 Sep 2017 06:51:50 GMT
 Server: acl
 Content-Type: text/json; charset=utf-8
-Content-Length: 1588
+Content-Length: 552
 Connection: Keep-Alive
 
 {"status":200,"msg":"ok","data":[{"status":200,"name":"*.*.*.*:53","type":5,"start":0,"owner":"","path":"/opt/soft/acl-master/libexec/udp-echo","conf":"/opt/soft/acl-master/conf/service/udp-echo.cf","proc_max":1,"proc_prefork":1,"proc_total":1,"proc_avail":1,"throttle_delay":6,"listen_fd_count":0,"notify_addr":"","notify_recipients":"","env":[{"LOG":"/opt/soft/acl-master/var/log/udp-echo"},{"MASTER_LOG":"/opt/soft/acl-master/var/log/acl_master"},{"SERVICE_LOG":"/opt/soft/acl-master/var/log/udp-echo"}],"procs":[{"pid":26036,"start":1505803886}]}]}
@@ -36,12 +37,13 @@ Connection: Keep-Alive
 
 请求协议
 ```
-POST /?cmd=stat HTTP/1.0
-Content-Length: 81
+POST /?cmd=stat HTTP/1.1
+Host: localhost
+Content-Length: 80
 Connection: keep-alive
 Content-Type: text/json
 
-{ cmd: 'stat', data: [{'path':'/opt/soft/acl-master/conf/service/udp-echo.cf'}]}
+{"cmd":"stat","data":[{"path":"/opt/soft/acl-master/conf/service/udp-echo.cf"}]}
 ```
 
 响应协议
@@ -60,12 +62,13 @@ Connection: Keep-Alive
 
 请求协议
 ```
-POST /?cmd=stop HTTP/1.0
-Content-Length: 81
+POST /?cmd=stop HTTP/1.1
+Host: localhost
+Content-Length: 80
 Connection: keep-alive
 Content-Type: text/json
 
-{ cmd: 'stop', data: [{'path':'/opt/soft/acl-master/conf/service/udp-echo.cf'}]}
+{"cmd":"stop","data":[{"path":"/opt/soft/acl-master/conf/service/udp-echo.cf"}]}
 ```
 
 响应协议
@@ -84,12 +87,13 @@ Connection: Keep-Alive
 
 请求协议
 ```
-POST /?cmd=start HTTP/1.0
-Content-Length: 83
+POST /?cmd=start HTTP/1.1
+Host: localhost
+Content-Length: 81
 Connection: keep-alive
 Content-Type: text/json
 
-{ cmd: 'start', data: [{'path':'/opt/soft/acl-master/conf/service/udp-echo.cf'}]}
+{"cmd":"start","data":[{"path":"/opt/soft/acl-master/conf/service/udp-echo.cf"}]}
 ```
 
 响应协议
@@ -108,12 +112,13 @@ Connection: Keep-Alive
 
 请求协议
 ```
-POST /?cmd=reload HTTP/1.0
-Content-Length: 84
+POST /?cmd=reload HTTP/1.1
+Host: localhost
+Content-Length: 82
 Connection: keep-alive
 Content-Type: text/json
 
-{ cmd: 'reload', data: [{'path':'/opt/soft/acl-master/conf/service/udp-echo.cf'}]}
+{"cmd":"reload","data":[{"path":"/opt/soft/acl-master/conf/service/udp-echo.cf"}]}
 ```
 
 响应协议
@@ -127,3 +132,16 @@ Connection: Keep-Alive
 
 {"status":200,"msg":"ok","data":[{"status":200,"proc_count":1,"proc_signaled":1,"path":"/opt/soft/acl-master/conf/service/udp-echo.cf"}]}
 ```
+
+### 6. 给指定服务的进程发送指定信号
+
+请求协议
+```
+POST /?cmd=signal HTTP/1.1
+Host: localhost
+Content-Length: 96
+Connection: keep-alive
+Content-Type: text/json
+
+{"cmd":"signal","signum":"SIGUSR1","data":[{"path":"/opt/soft/acl-master/conf/service/mf.cf"}]}}
+```

app/master/tools/master_ctl/http_request.h

@@ -12,21 +12,20 @@ bool http_request(const char* addr, TReq& req, TRes& res)
 	conn.request_header().set_url(url).set_keep_alive(false)
 		.set_content_type("text/json");
 
-	if (conn.request(body, body.size()) == false)
-	{
+	if (!conn.request(body, body.size())) {
 		printf("request error, json=[%s]\r\n", body.c_str());
 		return false;
 	}
 
+	//printf("body=%s\n", body.c_str());
+
 	acl::json json;
-	if (conn.get_body(json) == false)
-	{
+	if (!conn.get_body(json)) {
 		printf("get_body error, json=[%s]\r\n", body.c_str());
 		return false;
 	}
 
-	if (deserialize<TRes>(json, res) == false)
-	{
+	if (!deserialize<TRes>(json, res)) {
 		printf("deserialize error, req json=[%s]\r\n", body.c_str());
 		return false;
 	}