[master] 9577a7a Add missing newline, move thread/errno info after backtrace.
Poul-Henning Kamp
phk at FreeBSD.org
Sat Feb 25 22:57:05 CET 2017
commit 9577a7a63c153c303c590153372eba42d8829708
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Feb 25 20:30:18 2017 +0000
Add missing newline, move thread/errno info after backtrace.
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index bc21304..f6446af 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -605,7 +605,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
case VAS_MISSING:
VSB_printf(pan_vsb,
"Missing errorhandling code in %s(), %s line %d:\n"
- " Condition(%s) not true.",
+ " Condition(%s) not true.\n",
func, file, line, cond);
break;
case VAS_INCOMPLETE:
@@ -621,13 +621,6 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
func, file, line, cond);
break;
}
- if (err)
- VSB_printf(pan_vsb, "errno = %d (%s)\n", err, strerror(err));
-
- q = THR_GetName();
- if (q != NULL)
- VSB_printf(pan_vsb, "thread = (%s)\n", q);
-
VSB_printf(pan_vsb, "version = %s, vrt api = %u.%u\n",
VCS_version, VRT_MAJOR_VERSION, VRT_MINOR_VERSION);
VSB_printf(pan_vsb, "ident = %s,%s\n",
@@ -637,6 +630,13 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
pan_backtrace(pan_vsb);
+ if (err)
+ VSB_printf(pan_vsb, "errno = %d (%s)\n", err, strerror(err));
+
+ q = THR_GetName();
+ if (q != NULL)
+ VSB_printf(pan_vsb, "thread = (%s)\n", q);
+
if (!FEATURE(FEATURE_SHORT_PANIC)) {
req = THR_GetRequest();
VSB_cat(pan_vsb, "thr.");
More information about the varnish-commit
mailing list