Monitor server enhancement

- send buffer formated by stats functions to clients
- close client socket if needed
- allow bind to reuse an address if nobody listen on it

include/monitor.h

@@ -55,6 +55,7 @@ union pyfcgi_monitor_addr_u
 struct pyfcgi_monitor_s
 {
 	int sockserv;
+	int sockcli;
 	int sockargs[3];
 	pyfcgi_monitor_addr_t addr;
 

src/monitor.c

@@ -6,7 +6,30 @@ static void clean_exit(int status)
 {
 	if(pyfcgi_mon.sockserv)
 	{
-		close(pyfcgi_mon.sockserv);
+		if(pyfcgi_mon.sockcli)
+		{
+			if(shutdown(pyfcgi_mon.sockcli, SHUT_RDWR) < 0)
+			{
+				pyfcgi_log(LOG_WARNING, "Unable to shutdown clisocket : %s",
+					strerror(errno));
+			}
+			if(close(pyfcgi_mon.sockcli) < 0)
+			{
+				pyfcgi_log(LOG_WARNING, "Unable to close clisocket : %s",
+					strerror(errno));
+			}
+		}
+		pyfcgi_log(LOG_INFO, "Closing listening socket...");
+		if(shutdown(pyfcgi_mon.sockserv, SHUT_RDWR) < 0)
+		{
+			pyfcgi_log(LOG_WARNING, "Unable to shutdown socket : %s",
+				strerror(errno));
+		}
+		if(close(pyfcgi_mon.sockserv) < 0)
+		{
+			pyfcgi_log(LOG_WARNING, "Unable to close socket : %s",
+				strerror(errno));
+		}
 	}
 	exit(status);
 }
@@ -82,7 +105,7 @@ int pyfcgi_monitor_IPC_init()
 void pyfcgi_monitor_loop()
 {
 	pyfcgi_monitor_addr_t addr;
-	int *sockargs;
+	int *sockargs, reuse;
 	socklen_t addrlen;
 
 	sockargs = pyfcgi_mon.sockargs;
@@ -118,12 +141,20 @@ void pyfcgi_monitor_loop()
 	{
 		addrlen = sizeof(struct sockaddr_un);
 	}
-	
+	reuse = 1;
+	if(setsockopt(pyfcgi_mon.sockserv, SOL_SOCKET, SO_REUSEADDR, &reuse,
+		sizeof(int)) < 0)
+	{
+		pyfcgi_log(LOG_WARNING, "Unable to set socket option : %s",
+			strerror(errno));
+	}
 	if(bind(pyfcgi_mon.sockserv, (struct sockaddr*)&addr, addrlen) < 0)
 	{
-		pyfcgi_log(LOG_ERR, "Unable to bind socket... Retrying in 10s");
+		pyfcgi_log(LOG_ERR, "Unable to bind socket... : %s",
+			strerror(errno));
+		pyfcgi_log(LOG_INFO, "Retrying in 10s");
 		close(pyfcgi_mon.sockserv);
-		sleep(30);
+		sleep(10);
 		clean_exit(PYFCGI_ERR);
 	}
 	pyfcgi_log(LOG_INFO, "Listening on %s", PyFCGI_conf.mon_socket);
@@ -146,9 +177,10 @@ void pyfcgi_monitor_stream_loop(pyfcgi_monitor_addr_t addr_serv)
 {
 	pyfcgi_monitor_addr_t cliaddr;
 	socklen_t addrlen;
-	int sockcli, err;
+	int sockcli, err, ret;
 	char ipstr[64];
-	char name[] = "PYFCGI_"VERSION"\n";
+	const char *buff;
+	size_t bufflen;
 
 	addrlen = sizeof(cliaddr);
 	if(listen(pyfcgi_mon.sockserv, PYFCGI_MONITOR_STREAM_BACKLOG) < 0)
@@ -160,7 +192,7 @@ void pyfcgi_monitor_stream_loop(pyfcgi_monitor_addr_t addr_serv)
 	
 	while(1)
 	{
-		sockcli = accept(pyfcgi_mon.sockserv,
+		sockcli = pyfcgi_mon.sockcli = accept(pyfcgi_mon.sockserv,
 			(struct sockaddr*)&cliaddr, &addrlen);
 		if(sockcli < 0)
 		{
@@ -176,10 +208,28 @@ void pyfcgi_monitor_stream_loop(pyfcgi_monitor_addr_t addr_serv)
 				strerror(errno));
 			strcpy(ipstr, "XXX");
 		}
+		if(!pyfcgi_stats_format())
+		{
+			pyfcgi_log(LOG_ERR, "Unable to format stats...");
+			close(sockcli);
+			continue;
+		}
+		pyfcgi_stats_buff(&buff, &bufflen);
 		pyfcgi_log(LOG_INFO, "Sending stats to %s", ipstr);
 		
-		send(sockcli, name, strlen(name), 0);
+		do
+		{
+			ret = send(sockcli, buff, bufflen, 0);
+			err = errno;
+		}while(ret == -1 && err == EINTR);
+		if(ret == -1)
+		{
+			pyfcgi_log(LOG_WARNING, "Unable to send stats to client : %s",
+				strerror(err));
+		}
+		shutdown(sockcli, SHUT_RDWR);
 		close(sockcli);
+		pyfcgi_mon.sockcli = 0;
 		
 		addrlen = sizeof(cliaddr);
 	}