Better loggin in -ii mode (conn closed, pid in almost all msgs)

Author: Clifford Wolf

csync2.c

@@ -56,6 +56,8 @@ int csync_error_count = 0;
 int csync_debug_level = 0;
 FILE *csync_debug_out = 0;
 
+int csync_server_child_pid = 0;
+
 enum {
 	MODE_NONE,
 	MODE_HINT,
@@ -206,11 +208,16 @@ static int csync_server_loop(int single_connect)
 		int conn = accept(listenfd, (struct sockaddr *) &addr, &addrlen);
 		if (conn < 0) goto error;
 
-		printf("New connection from %s:%u.\n",
-			inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
 		fflush(stdout); fflush(stderr);
 
 		if (single_connect || !fork()) {
+			csync_server_child_pid = getpid();
+			fprintf(stderr, "<%d> New connection from %s:%u.\n",
+				csync_server_child_pid,
+				inet_ntoa(addr.sin_addr),
+				ntohs(addr.sin_port));
+			fflush(stderr);
+
 			dup2(conn, 0);
 			dup2(conn, 1);
 			close(conn);
@@ -427,6 +434,7 @@ int main(int argc, char ** argv)
 	yyin = fopen(file_config, "r");
 	if ( !yyin ) csync_fatal("Can't open config file.\n");
 	yyparse();
+	fclose(yyin);
 
 	csync_db_open(file_database);
 
@@ -636,9 +644,17 @@ int main(int argc, char ** argv)
 
 	csync_run_commands();
 	csync_db_close();
+
 	if ( csync_error_count != 0 )
 		csync_debug(0, "Finished with %d errors.\n", csync_error_count);
 	if ( retval >= 0 && csync_error_count == 0 ) return retval;
+
+	if ( csync_server_child_pid ) {
+		fprintf(stderr, "<%d> Connection closed.\n",
+				csync_server_child_pid);
+		fflush(stderr);
+	}
+
 	return csync_error_count != 0;
 }
 

csync2.h

@@ -285,6 +285,8 @@ extern int csync_error_count;
 extern int csync_debug_level;
 extern FILE *csync_debug_out;
 
+extern int csync_server_child_pid;
+
 extern char myhostname[];
 extern char *active_grouplist;
 extern char *active_peerlist;

error.c

@@ -28,6 +28,9 @@ void csync_fatal(const char *fmt, ...)
 {
 	va_list ap;
 
+	if ( csync_server_child_pid )
+		fprintf(csync_debug_out, "<%d>", csync_server_child_pid);
+
 	va_start(ap, fmt);
 	vfprintf(csync_debug_out, fmt, ap);
 	va_end(ap);
@@ -42,6 +45,9 @@ void csync_debug(int lv, const char *fmt, ...)
 
 	if ( csync_debug_level < lv ) return;
 
+	if ( csync_server_child_pid )
+		fprintf(csync_debug_out, "<%d>", csync_server_child_pid);
+
 	va_start(ap, fmt);
 	vfprintf(csync_debug_out, fmt, ap);
 	va_end(ap);