Fix problem with logging filtering

knizhnik · knizhnik · commit 85b247d76dd8 · 2019-01-23T23:33:22.000+03:00
diff --git a/src/utils/logger.c b/src/utils/logger.c
@@ -159,12 +159,16 @@ elog_internal(int elevel, bool file_only, const char *message)
 
 	write_to_file = elevel >= logger_config.log_level_file
 		&& logger_config.log_directory
-		&& logger_config.log_directory[0] != '\0'
-		&& !remote_agent;
+		&& logger_config.log_directory[0] != '\0';
 	write_to_error_log = elevel >= ERROR && logger_config.error_log_filename &&
-		logger_config.log_directory && logger_config.log_directory[0] != '\0'&& !remote_agent;
-	write_to_stderr = (elevel >= (remote_agent ? ERROR : logger_config.log_level_console) && !file_only) || remote_agent;
+		logger_config.log_directory && logger_config.log_directory[0] != '\0';
+	write_to_stderr = elevel >= logger_config.log_level_console && !file_only;
 
+	if (remote_agent)
+	{
+		write_to_stderr |= write_to_error_log | write_to_file;
+		write_to_error_log = write_to_file = false;
+	}
 	pthread_lock(&log_file_mutex);
 	loggin_in_progress = true;
 
diff --git a/src/utils/remote.c b/src/utils/remote.c
@@ -97,6 +97,8 @@ static void* error_reader_proc(void* arg)
 				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) {
