Fix copying args to std_args

za-arthur · za-arthur · commit d6ee6b113f4f · 2017-05-18T13:41:04.000+03:00
diff --git a/configure.c b/configure.c
@@ -2,7 +2,7 @@
  *
  * configure.c: - manage backup catalog.
  *
- * Portions Copyright (c) 2017-2017, Postgres Professional
+ * Copyright (c) 2017-2017, Postgres Professional
  *
  *-------------------------------------------------------------------------
  */
diff --git a/help.c b/help.c
@@ -2,7 +2,7 @@
  *
  * help.c
  *
- * Portions Copyright (c) 2017-2017, Postgres Professional
+ * Copyright (c) 2017-2017, Postgres Professional
  *
  *-------------------------------------------------------------------------
  */
diff --git a/utils/logger.c b/utils/logger.c
@@ -105,8 +105,7 @@ static void
 elog_internal(int elevel, const char *fmt, va_list args)
 {
 	bool		wrote_to_file = false,
-				write_to_error_log,
-				write_to_stderr;
+				write_to_error_log;
 	va_list		error_args,
 				std_args;
 
@@ -119,6 +118,9 @@ elog_internal(int elevel, const char *fmt, va_list args)
 	/* We need copy args only if we need write to error log file */
 	if (write_to_error_log)
 		va_copy(error_args, args);
+	/* We need copy args only if we need write to stderr */
+	if (elevel >= ERROR || !(log_filename && !logging_to_file))
+		va_copy(std_args, args);
 
 	/*
 	 * Write message to log file.
@@ -142,15 +144,6 @@ elog_internal(int elevel, const char *fmt, va_list args)
 		wrote_to_file = true;
 	}
 
-	/*
-	 * Write to stderr if the message was not written to log file.
-	 * Write to stderr if the message level is greater than WARNING anyway.
-	 */
-	write_to_stderr = !wrote_to_file || elevel >= ERROR;
-	/* We need copy args only if we need write to stderr */
-	if (write_to_stderr)
-		va_copy(std_args, error_args);
-
 	/*
 	 * Write error message to error log file.
 	 * Do not write to file if this error was raised during write previous
@@ -173,7 +166,11 @@ elog_internal(int elevel, const char *fmt, va_list args)
 		va_end(error_args);
 	}
 
-	if (write_to_stderr)
+	/*
+	 * Write to stderr if the message was not written to log file.
+	 * Write to stderr if the message level is greater than WARNING anyway.
+	 */
+	if (!wrote_to_file || elevel >= ERROR)
 	{
 		write_elevel(stderr, elevel);
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* configure.c: - manage backup catalog.`
`4`	`4`	`*`
`5`		`- * Portions Copyright (c) 2017-2017, Postgres Professional`
	`5`	`+ * Copyright (c) 2017-2017, Postgres Professional`
`6`	`6`	`*`
`7`	`7`	`*-------------------------------------------------------------------------`
`8`	`8`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* help.c`
`4`	`4`	`*`
`5`		`- * Portions Copyright (c) 2017-2017, Postgres Professional`
	`5`	`+ * Copyright (c) 2017-2017, Postgres Professional`
`6`	`6`	`*`
`7`	`7`	`*-------------------------------------------------------------------------`
`8`	`8`	`*/`