Log the location field before any backtrace

petere · petere · commit ff61359ad7cd · 2020-07-10T08:32:06.000+02:00
This order makes more sense because the location is effectively at the lowest level of the backtrace. Discussion: https://www.postgresql.org/message-id/flat/90f5fa04-c410-a54e-9449-aa3749fb7972%402ndquadrant.com
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -2938,13 +2938,6 @@ send_message_to_server_log(ErrorData *edata)
 			append_with_tabs(&buf, edata->context);
 			appendStringInfoChar(&buf, '\n');
 		}
-		if (edata->backtrace)
-		{
-			log_line_prefix(&buf, edata);
-			appendStringInfoString(&buf, _("BACKTRACE:  "));
-			append_with_tabs(&buf, edata->backtrace);
-			appendStringInfoChar(&buf, '\n');
-		}
 		if (Log_error_verbosity >= PGERROR_VERBOSE)
 		{
 			/* assume no newlines in funcname or filename... */
@@ -2962,6 +2955,13 @@ send_message_to_server_log(ErrorData *edata)
 								 edata->filename, edata->lineno);
 			}
 		}
+		if (edata->backtrace)
+		{
+			log_line_prefix(&buf, edata);
+			appendStringInfoString(&buf, _("BACKTRACE:  "));
+			append_with_tabs(&buf, edata->backtrace);
+			appendStringInfoChar(&buf, '\n');
+		}
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -2938,13 +2938,6 @@ send_message_to_server_log(ErrorData *edata)`
`2938`	`2938`	`append_with_tabs(&buf, edata->context);`
`2939`	`2939`	`appendStringInfoChar(&buf, '\n');`
`2940`	`2940`	`}`
`2941`		`- if (edata->backtrace)`
`2942`		`- {`
`2943`		`- log_line_prefix(&buf, edata);`
`2944`		`- appendStringInfoString(&buf, _("BACKTRACE: "));`
`2945`		`- append_with_tabs(&buf, edata->backtrace);`
`2946`		`- appendStringInfoChar(&buf, '\n');`
`2947`		`- }`
`2948`	`2941`	`if (Log_error_verbosity >= PGERROR_VERBOSE)`
`2949`	`2942`	`{`
`2950`	`2943`	`/* assume no newlines in funcname or filename... */`
`@@ -2962,6 +2955,13 @@ send_message_to_server_log(ErrorData *edata)`
`2962`	`2955`	`edata->filename, edata->lineno);`
`2963`	`2956`	`}`
`2964`	`2957`	`}`
	`2958`	`+ if (edata->backtrace)`
	`2959`	`+ {`
	`2960`	`+ log_line_prefix(&buf, edata);`
	`2961`	`+ appendStringInfoString(&buf, _("BACKTRACE: "));`
	`2962`	`+ append_with_tabs(&buf, edata->backtrace);`
	`2963`	`+ appendStringInfoChar(&buf, '\n');`
	`2964`	`+ }`
`2965`	`2965`	`}`
`2966`	`2966`
`2967`	`2967`	`/*`