Skip to content

V
varnish-cache
Unverified Commit 8b3ac69c authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

panic: do not dump session attrs for magic mismatch

parent d0e986a6
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
bin/varnishd/cache/cache_panic.c
View file @ 8b3ac69c
...@@ -559,12 +559,19 @@ pan_sess(struct vsb *vsb, const struct sess *sp) ...@@ -559,12 +559,19 @@ pan_sess(struct vsb *vsb, const struct sess *sp)
return; return;
VSB_indent(vsb, 2); VSB_indent(vsb, 2);
PAN_CheckMagic(vsb, sp, SESS_MAGIC); PAN_CheckMagic(vsb, sp, SESS_MAGIC);
xp = XPORT_ByNumber(sp->sattr[SA_TRANSPORT]);
VSB_printf(vsb, "fd = %d, vxid = %u,\n", VSB_printf(vsb, "fd = %d, vxid = %u,\n",
sp->fd, VXID(sp->vxid)); sp->fd, VXID(sp->vxid));
VSB_printf(vsb, "t_open = %f,\n", sp->t_open); VSB_printf(vsb, "t_open = %f,\n", sp->t_open);
VSB_printf(vsb, "t_idle = %f,\n", sp->t_idle); VSB_printf(vsb, "t_idle = %f,\n", sp->t_idle);
if (! VALID_OBJ(sp, SESS_MAGIC)) {
VSB_indent(vsb, -2);
VSB_cat(vsb, "},\n");
return;
}
WS_Panic(sp->ws, vsb); WS_Panic(sp->ws, vsb);
xp = XPORT_ByNumber(sp->sattr[SA_TRANSPORT]);
VSB_printf(vsb, "transport = %s", VSB_printf(vsb, "transport = %s",
xp == NULL ? "<none>" : xp->name); xp == NULL ? "<none>" : xp->name);
if (xp != NULL && xp->sess_panic != NULL) { if (xp != NULL && xp->sess_panic != NULL) {
...@@ -575,6 +582,7 @@ pan_sess(struct vsb *vsb, const struct sess *sp) ...@@ -575,6 +582,7 @@ pan_sess(struct vsb *vsb, const struct sess *sp)
VSB_cat(vsb, "}"); VSB_cat(vsb, "}");
} }
VSB_cat(vsb, "\n"); VSB_cat(vsb, "\n");
// duplicated below, remove ? // duplicated below, remove ?
ci = SES_Get_String_Attr(sp, SA_CLIENT_IP); ci = SES_Get_String_Attr(sp, SA_CLIENT_IP);
cp = SES_Get_String_Attr(sp, SA_CLIENT_PORT); cp = SES_Get_String_Attr(sp, SA_CLIENT_PORT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment