Fix problem with logging

knizhnik · knizhnik · commit 4e3e62b1cf14 · 2019-01-24T00:28:49.000+03:00
diff --git a/src/utils/logger.c b/src/utils/logger.c
@@ -131,6 +131,9 @@ exit_if_necessary(int elevel)
 			pthread_mutex_unlock(&log_file_mutex);
 		}
 
+		if (remote_agent)
+			sleep(1); /* Let parent receive sent messages */
+		
 		/* If this is not the main thread then don't call exit() */
 		if (main_tid != pthread_self())
 #ifdef WIN32
diff --git a/src/utils/remote.c b/src/utils/remote.c
@@ -79,12 +79,20 @@ static void kill_child(void)
 	kill(child_pid, SIGTERM);
 }
 
+
+static void print_message(char const* buf)
+{
+	char const* const severity[] = {"VERBOSE", "LOG", "INFO", "NOTICE", "WARNING", "FATAL", "ERROR", ""};
+	size_t i;
+	for (i = 0; strncmp(buf, severity[i], strlen(severity[i])) != 0; i++);
+	elog(i+VERBOSE, "%s", buf + strlen(severity[i]) + 2);
+}
+
 static void* error_reader_proc(void* arg)
 {
 	int* errfd = (int*)arg;
 	char buf[ERR_BUF_SIZE];
 	int offs = 0, rc;
-
 	while ((rc = read(errfd[0], &buf[offs], sizeof(buf) - offs)) > 0)
 	{
 		char* nl;
@@ -93,22 +101,15 @@ static void* error_reader_proc(void* arg)
 		nl = strchr(buf, '\n');
 		if (nl != NULL) {
 			*nl = '\0';
-			if (strncmp(buf, "ERROR: ", 7) == 0) {
-				elog(ERROR, "%s", buf + 7);
-			} if (strncmp(buf, "WARNING: ", 9) == 0) {
-				elog(WARNING, "%s", buf + 9);
-			} if (strncmp(buf, "VERBOSE: ", 9) == 0) {
-				elog(VERBOSE, "%s", buf + 9);
-			} else if (strncmp(buf, "LOG: ", 5) == 0) {
-				elog(LOG, "%s", buf + 5);
-			} else if (strncmp(buf, "INFO: ", 6) == 0) {
-				elog(INFO, "%s", buf + 6);
-			} else {
-				elog(LOG, "%s", buf);
-			}
+			print_message(buf);
 			memmove(buf, nl+1, offs -= (nl + 1 - buf));
 		}
 	}
+	if (offs != 0)
+	{
+		buf[offs] = '\0';
+		print_message(buf);
+	}
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,9 @@ exit_if_necessary(int elevel)`
`131`	`131`	`pthread_mutex_unlock(&log_file_mutex);`
`132`	`132`	`}`
`133`	`133`
	`134`	`+ if (remote_agent)`
	`135`	`+ sleep(1); /* Let parent receive sent messages */`
	`136`	`+`
`134`	`137`	`/* If this is not the main thread then don't call exit() */`
`135`	`138`	`if (main_tid != pthread_self())`
`136`	`139`	`#ifdef WIN32`