- enhanced log messages

- code cosmetic

Author: Jérôme Loyet

sapi/fpm/fpm/fastcgi.c

@@ -29,8 +29,9 @@
 #include <limits.h>
 
 #include <php_config.h>
-#include <fpm/fpm.h>
-#include <fpm/fpm_request.h>
+#include "fpm.h"
+#include "fpm_request.h"
+#include "zlog.h"
 
 #ifdef _WIN32
 
@@ -267,7 +268,7 @@ void fcgi_set_allowed_clients(char *ip)
 			}
 			allowed_clients[n] = inet_addr(cur);
 			if (allowed_clients[n] == INADDR_NONE) {
-				fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS or listen.allowed_clients\n", cur);
+				zlog(ZLOG_ERROR, "Wrong IP address '%s' in listen.allowed_clients", cur);
 			}
 			n++;
 			cur = end;
@@ -815,7 +816,7 @@ int fcgi_accept_request(fcgi_request *req)
 							n++;
 						}
 						if (!allowed) {
-							fprintf(stderr, "Connection from disallowed IP address '%s' is dropped.\n", inet_ntoa(sa.sa_inet.sin_addr));
+							zlog(ZLOG_ERROR, "Connection disallowed: IP address '%s' has been dropped.", inet_ntoa(sa.sa_inet.sin_addr));
 							closesocket(req->fd);
 							req->fd = -1;
 							continue;
@@ -871,7 +872,7 @@ int fcgi_accept_request(fcgi_request *req)
 						}
 						fcgi_close(req, 1, 0);
 					} else {
-						fprintf(stderr, "Too many open file descriptors. FD_SETSIZE limit exceeded.");
+						zlog(ZLOG_ERROR, "Too many open file descriptors. FD_SETSIZE limit exceeded.");
 						fcgi_close(req, 1, 0);
 					}
 #endif

sapi/fpm/fpm/fpm.c

@@ -65,11 +65,13 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
 		if (fpm_globals.test_successful) {
 			exit(0);
 		} else {
+			zlog(ZLOG_ERROR, "FPM initialization failed");
 			return -1;
 		}
 	}
 
 	if (0 > fpm_conf_write_pid()) {
+		zlog(ZLOG_ERROR, "FPM initialization failed");
 		return -1;
 	}
 

sapi/fpm/fpm/fpm_children.c

@@ -147,13 +147,13 @@ static void fpm_child_init(struct fpm_worker_pool_s *wp) /* {{{ */
 {
 	fpm_globals.max_requests = wp->config->pm_max_requests;
 
-	if (0 > fpm_stdio_init_child(wp) ||
-		0 > fpm_log_init_child(wp) ||
-		0 > fpm_status_init_child(wp) ||
-		0 > fpm_unix_init_child(wp) ||
-		0 > fpm_signals_init_child() ||
-		0 > fpm_env_init_child(wp) ||
-		0 > fpm_php_init_child(wp)) {
+	if (0 > fpm_stdio_init_child(wp)  ||
+	    0 > fpm_log_init_child(wp)    ||
+	    0 > fpm_status_init_child(wp) ||
+	    0 > fpm_unix_init_child(wp)   ||
+	    0 > fpm_signals_init_child()  ||
+	    0 > fpm_env_init_child(wp)    ||
+	    0 > fpm_php_init_child(wp)) {
 
 		zlog(ZLOG_ERROR, "[pool %s] child failed to initialize", wp->config->name);
 		exit(255);
@@ -292,7 +292,7 @@ void fpm_children_bury() /* {{{ */
 				}
 			}
 		} else {
-			zlog(ZLOG_ALERT, "oops, unknown child (%d) exited %s", pid, buf);
+			zlog(ZLOG_ALERT, "oops, unknown child (%d) exited %s. Please open a bug report (https://bugs.php.net).", pid, buf);
 		}
 	}
 }
@@ -305,7 +305,7 @@ static struct fpm_child_s *fpm_resources_prepare(struct fpm_worker_pool_s *wp) /
 	c = fpm_child_alloc();
 
 	if (!c) {
-		zlog(ZLOG_ERROR, "[pool %s] malloc failed", wp->config->name);
+		zlog(ZLOG_ERROR, "[pool %s] unable to malloc new child", wp->config->name);
 		return 0;
 	}
 

sapi/fpm/fpm/fpm_cleanup.c

@@ -8,7 +8,6 @@
 
 #include "fpm_arrays.h"
 #include "fpm_cleanup.h"
-#include "zlog.h"
 
 struct cleanup_s {
 	int type;

sapi/fpm/fpm/fpm_conf.c

@@ -47,7 +47,6 @@
 
 #define STR2STR(a) (a ? a : "undefined")
 #define BOOL2STR(a) (a ? "yes" : "no")
-#define PM2STR(a) (a == PM_STYLE_STATIC ? "static" : "dynamic")
 #define GO(field) offsetof(struct fpm_global_config_s, field)
 #define WPO(field) offsetof(struct fpm_worker_pool_config_s, field)
 
@@ -680,7 +679,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 	struct fpm_worker_pool_s *wp;
 
 	if (!fpm_worker_all_pools) {
-		zlog(ZLOG_ERROR, "at least one pool section must be specified in config file");
+		zlog(ZLOG_ERROR, "No pool defined. at least one pool section must be specified in config file");
 		return -1;
 	}
 
@@ -742,8 +741,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 
 			if (config->pm_min_spare_servers > config->pm_max_children ||
 					config->pm_max_spare_servers > config->pm_max_children) {
-				zlog(ZLOG_ALERT, "[pool %s] pm.min_spare_servers(%d) and pm.max_spare_servers(%d) cannot be greater than pm.max_children(%d)",
-						wp->config->name, config->pm_min_spare_servers, config->pm_max_spare_servers, config->pm_max_children);
+				zlog(ZLOG_ALERT, "[pool %s] pm.min_spare_servers(%d) and pm.max_spare_servers(%d) cannot be greater than pm.max_children(%d)", wp->config->name, config->pm_min_spare_servers, config->pm_max_spare_servers, config->pm_max_children);
 				return -1;
 			}
 
@@ -755,6 +753,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 			if (config->pm_start_servers <= 0) {
 				config->pm_start_servers = config->pm_min_spare_servers + ((config->pm_max_spare_servers - config->pm_min_spare_servers) / 2);
 				zlog(ZLOG_WARNING, "[pool %s] pm.start_servers is not set. It's been set to %d.", wp->config->name, config->pm_start_servers);
+
 			} else if (config->pm_start_servers < config->pm_min_spare_servers || config->pm_start_servers > config->pm_max_spare_servers) {
 				zlog(ZLOG_ALERT, "[pool %s] pm.start_servers(%d) must not be less than pm.min_spare_servers(%d) and not greater than pm.max_spare_servers(%d)", wp->config->name, config->pm_start_servers, config->pm_min_spare_servers, config->pm_max_spare_servers);
 				return -1;
@@ -766,7 +765,6 @@ static int fpm_conf_process_all_pools() /* {{{ */
 		if (wp->config->pm_status_path && *wp->config->pm_status_path) {
 			int i;
 			char *status = wp->config->pm_status_path;
-			/* struct fpm_status_s fpm_status; */
 
 			if (*status != '/') {
 				zlog(ZLOG_ERROR, "[pool %s] the status path '%s' must start with a '/'", wp->config->name, status);
@@ -860,7 +858,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 				fd = open(wp->config->slowlog, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
 
 				if (0 > fd) {
-					zlog(ZLOG_SYSERROR, "open(%s) failed", wp->config->slowlog);
+					zlog(ZLOG_SYSERROR, "Unable to create or open slowlog(%s)", wp->config->slowlog);
 					return -1;
 				}
 				close(fd);
@@ -876,6 +874,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 				zlog(ZLOG_ERROR, "[pool %s] the chroot path '%s' must start with a '/'", wp->config->name, wp->config->chroot);
 				return -1;
 			}
+
 			if (!fpm_conf_is_dir(wp->config->chroot)) {
 				zlog(ZLOG_ERROR, "[pool %s] the chroot path '%s' does not exist or is not a directory", wp->config->name, wp->config->chroot);
 				return -1;
@@ -993,7 +992,7 @@ int fpm_conf_unlink_pid() /* {{{ */
 {
 	if (fpm_global_config.pid_file) {
 		if (0 > unlink(fpm_global_config.pid_file)) {
-			zlog(ZLOG_SYSERROR, "unlink(\"%s\") failed", fpm_global_config.pid_file);
+			zlog(ZLOG_SYSERROR, "Unable to remove the PID file (%s).", fpm_global_config.pid_file);
 			return -1;
 		}
 	}
@@ -1013,14 +1012,14 @@ int fpm_conf_write_pid() /* {{{ */
 		fd = creat(fpm_global_config.pid_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 
 		if (fd < 0) {
-			zlog(ZLOG_SYSERROR, "creat(\"%s\") failed", fpm_global_config.pid_file);
+			zlog(ZLOG_SYSERROR, "Unable to create the PID file (%s).", fpm_global_config.pid_file);
 			return -1;
 		}
 
 		len = sprintf(buf, "%d", (int) fpm_globals.parent_pid);
 
 		if (len != write(fd, buf, len)) {
-			zlog(ZLOG_SYSERROR, "write() failed");
+			zlog(ZLOG_SYSERROR, "Unable to write to the PID file.");
 			return -1;
 		}
 		close(fd);
@@ -1355,18 +1354,18 @@ int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
 	int ret = 1;
 
 	if (!filename || !filename[0]) {
-		zlog(ZLOG_ERROR, "Configuration file is empty");
+		zlog(ZLOG_ERROR, "configuration filename is empty");
 		return -1;
 	}
 
 	fd = open(filename, O_RDONLY, 0);
 	if (fd < 0) {
-		zlog(ZLOG_ERROR, "Unable to open file '%s', errno=%d", filename, errno);
+		zlog(ZLOG_SYSERROR, "failed to open configuration file '%s'", filename);
 		return -1;
 	}
 
 	if (ini_recursion++ > 4) {
-		zlog(ZLOG_ERROR, "You can include more than 5 files recusively");
+		zlog(ZLOG_ERROR, "failed to include more than 5 files recusively");
 		return -1;
 	}
 

sapi/fpm/fpm/fpm_conf.h

@@ -8,6 +8,8 @@
 #include <stdint.h>
 #include "php.h"
 
+#define PM2STR(a) (a == PM_STYLE_STATIC ? "static" : "dynamic")
+
 #define FPM_CONF_MAX_PONG_LENGTH 64
 
 struct key_value_s;

sapi/fpm/fpm/fpm_env.c

@@ -13,7 +13,6 @@
 
 #include "fpm_env.h"
 #include "fpm.h"
-#include "zlog.h"
 
 #ifndef HAVE_SETPROCTITLE
 #ifdef __linux__

sapi/fpm/fpm/fpm_events.c

@@ -66,7 +66,7 @@ static void fpm_got_signal(struct fpm_event_s *ev, short which, void *arg) /* {{
 
 		if (res <= 0) {
 			if (res < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
-				zlog(ZLOG_SYSERROR, "read() failed");
+				zlog(ZLOG_SYSERROR, "unable to read from the signal pipe");
 			}
 			return;
 		}
@@ -153,7 +153,7 @@ static int fpm_event_queue_add(struct fpm_event_queue_s **queue, struct fpm_even
 	}
 
 	if (!(elt = malloc(sizeof(struct fpm_event_queue_s)))) {
-		zlog(ZLOG_SYSERROR, "malloc() failed");
+		zlog(ZLOG_SYSERROR, "Unable to add the event to queue: malloc() failed");
 		return -1;
 	}
 	elt->prev = NULL;
@@ -232,7 +232,7 @@ int fpm_event_init_main() /* {{{ */
 	/* malloc the max number of necessary fds for polling */
 	fpm_event_ufds = malloc(sizeof(php_pollfd) * fpm_event_nfds_max);
 	if (!fpm_event_ufds) {
-		zlog(ZLOG_SYSERROR, "malloc() failed");
+		zlog(ZLOG_SYSERROR, "Error while initializing events: malloc() failed");
 		return -1;
 	}
 
@@ -318,7 +318,7 @@ void fpm_event_loop(int err) /* {{{ */
 		/* wait for inconming event or timeout */
 		if ((ret = php_poll2(fpm_event_ufds, i, timeout)) == -1) {
 			if (errno != EINTR) {
-				zlog(ZLOG_WARNING, "php_poll2() returns %d", errno);
+				zlog(ZLOG_SYSERROR, "failed to wait for events: php_poll2()");
 			}
 		} else if (ret > 0) {
 

sapi/fpm/fpm/fpm_log.c

@@ -44,7 +44,7 @@ int fpm_log_open(int reopen) /* {{{ */
 
 		fd = open(wp->config->access_log, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
 		if (0 > fd) {
-			zlog(ZLOG_SYSERROR, "open(\"%s\") failed", wp->config->access_log);
+			zlog(ZLOG_SYSERROR, "failed to open access log (%s)", wp->config->access_log);
 			return -1;
 		}
 
@@ -124,12 +124,12 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 	if (!test) {
 		scoreboard = fpm_scoreboard_get();
 		if (!scoreboard) {
-			zlog(ZLOG_WARNING, "unable to get scoreboard");
+			zlog(ZLOG_WARNING, "unable to get scoreboard while preparing the access log");
 			return -1;
 		}
 		proc_p = fpm_scoreboard_proc_acquire(NULL, -1, 0);
 		if (!proc_p) {
-			zlog(ZLOG_WARNING, "[pool %s] Unable to acquire shm slot", scoreboard->pool);
+			zlog(ZLOG_WARNING, "[pool %s] Unable to acquire shm slot while preparing the access log", scoreboard->pool);
 			return -1;
 		}
 		proc = *proc_p;
@@ -147,7 +147,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
 	while (*s != '\0') {
 		if (len > FPM_LOG_BUFFER) {
-			zlog(ZLOG_NOTICE, "the log buffer is full (%d). The log request has been truncated.", FPM_LOG_BUFFER);
+			zlog(ZLOG_NOTICE, "the log buffer is full (%d). The access log request has been truncated.", FPM_LOG_BUFFER);
 			len = FPM_LOG_BUFFER - 1;
 			break;
 		}

sapi/fpm/fpm/fpm_main.c

@@ -100,13 +100,13 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #include "fastcgi.h"
 
 #include <php_config.h>
-#include <fpm/fpm.h>
-#include <fpm/fpm_request.h>
-#include <fpm/fpm_status.h>
-#include <fpm/fpm_conf.h>
-#include <fpm/fpm_php.h>
-#include <fpm/fpm_log.h>
-#include <fpm/zlog.h>
+#include "fpm.h"
+#include "fpm_request.h"
+#include "fpm_status.h"
+#include "fpm_conf.h"
+#include "fpm_php.h"
+#include "fpm_log.h"
+#include "zlog.h"
 
 #ifndef PHP_WIN32
 /* XXX this will need to change later when threaded fastcgi is implemented.  shane */

sapi/fpm/fpm/fpm_php.c

@@ -253,7 +253,7 @@ int fpm_php_limit_extensions(char *path) /* {{{ */
 	}
 
 
-	zlog(ZLOG_NOTICE, "Access to the file '%s' has been denied (see security.limit_extensions)", path);
+	zlog(ZLOG_NOTICE, "Access to the script '%s' has been denied (see security.limit_extensions)", path);
 	return 1; /* extension not found: not allowed  */
 }
 /* }}} */

sapi/fpm/fpm/fpm_php_trace.c

@@ -144,7 +144,7 @@ void fpm_php_trace(struct fpm_child_s *child) /* {{{ */
 	slowlog = fopen(child->wp->config->slowlog, "a+");
 
 	if (!slowlog) {
-		zlog(ZLOG_SYSERROR, "fopen(%s) failed", child->wp->config->slowlog);
+		zlog(ZLOG_SYSERROR, "unable to open slowlog (%s)", child->wp->config->slowlog);
 		goto done0;
 	}
 

sapi/fpm/fpm/fpm_process_ctl.c

@@ -99,7 +99,7 @@ static void fpm_pctl_exec() /* {{{ */
 
 	fpm_cleanups_run(FPM_CLEANUP_PARENT_EXEC);
 	execvp(saved_argv[0], saved_argv);
-	zlog(ZLOG_SYSERROR, "execvp() failed");
+	zlog(ZLOG_SYSERROR, "failed to reload: execvp() failed");
 	exit(1);
 }
 /* }}} */