Bugfix in logger ident update + deleted debug logging

include/conf.h

@@ -113,10 +113,10 @@ typedef struct pyfcgi_conf_s pyfcgi_conf_t;
 typedef struct pyfcgi_conf_logger_s pyfcgi_conf_logger_t;
 typedef struct pyfcgi_context_s pyfcgi_context_t;
 
+/**@brief Stores contextual informations about current process */
 struct pyfcgi_context_s {
 	pid_t pid;
 	pid_t ppid;
-	char *pidfile;
 };
 
 /**@brief Structure containing configuration
@@ -126,6 +126,9 @@ struct pyfcgi_context_s {
  */
 struct pyfcgi_conf_s
 {
+	/** @brief Stores pidfile path */
+	char *pidfile;
+
 	/**@brief Entrypoint module name
 	 * @ingroup conf_glob */
 	char *py_entrymod;

src/conf.c

@@ -99,7 +99,8 @@ int parse_args(int argc, char *argv[])
 				pyfcgi_logger_enable_syslog(ident);
 				break;
 			case 'P':
-				PyFCGI_conf.context.pidfile = strdup(optarg);
+				PyFCGI_conf.pidfile = strdup(optarg);
+				/**@todo create pidfile and put master pid in it */
 				break;
 			case 'h':
 				usage();
@@ -145,7 +146,6 @@ int check_entrypoint_import()
 	pid = fork();
 	if(!pid)
 	{
-		pyfcgi_log(LOG_DEBUG, "Checking entrypoint import");
 		pyinit();
 		ret = (void*)import_entrypoint();
 		if(!ret)
@@ -153,7 +153,7 @@ int check_entrypoint_import()
 			dprintf(2, "Unable to import entrypoint...\n");
 			exit(1);
 		}
-		pyfcgi_log(LOG_DEBUG, "Entrypoint import OK");
+		pyfcgi_log(LOG_DEBUG, "Entrypoint import [OK]");
 		Py_Exit(0);
 	}
 	waitpid(pid, &status, 0);

src/logger.c

@@ -247,6 +247,11 @@ int pyfcgi_logger_format_bufinit(pyfcgi_logger_format_t* fmt)
 	{ // if it is not the first call
 		free(fmt->buf);
 	}
+	if(fmt->_msg)
+	{ // delete message buffer to force prefix copy
+		free(fmt->_msg);
+		fmt->_msg = NULL;
+	}
 
 	i = 0;
 	pre_sz = 0;
@@ -574,7 +579,7 @@ int pyfcgi_logger_set_ident(const char* new_ident)
 		pyfcgi_logger_enable_syslog(new_ident);
 	}
 
-	len = strlen(new_ident);
+	len = strlen(conf->ident);
 	for(i=0; i<conf->format_sz; i++)
 	{
 		fmt = &(conf->formats[i]);
@@ -622,7 +627,7 @@ char* vpyfcgi_logger_format_message(pyfcgi_logger_format_t *fmt,
 		if(!fmt->_msg)
 		{
 			//TODO : error
-dprintf(2, "ERROR ALLOC _msg : %s", strerror(errno));
+dprintf(2, "ERROR ALLOC _msg : %s\n", strerror(errno));
 			return NULL;
 		}
 		memset(fmt->_msg, ' ', sizeof(char)*fmt->_msglen);

src/pyutils.c

@@ -57,9 +57,7 @@ void update_python_path()
 	}
 
 	// Fetch, dup & update the python path
-pyfcgi_log(LOG_DEBUG, "DEBUG 0");
 	ppath = Py_GetPath();
-pyfcgi_log(LOG_DEBUG, "DEBUG 1");
 	if(!ppath)
 	{
 		if(PyErr_Occurred())

src/responder.c

@@ -43,6 +43,7 @@ int responder_loop()
 	timeout.tv_nsec = 100000000;
 	idle = 0;
 
+	pyfcgi_logger_set_ident("pool");
 	pyfcgi_log(LOG_INFO, "Preparing workers");
 
 	init_context();