Skip to content

V
varnish-cache
Commit b0e924cd authored by Nils Goroll's avatar Nils Goroll Committed by Dridi Boukelmoune
Browse files
Options

tell the truth about vmod filenames

parent ca354bdd
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
bin/varnishd/cache/cache_vrt_vmod.c
View file @ b0e924cd
......@@ -93,7 +93,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
dlhdl = dlopen(backup, RTLD_NOW | RTLD_LOCAL);
if (dlhdl == NULL) {
VSB_printf(ctx->msg, "Loading vmod %s from %s:\n", nm, backup);
VSB_printf(ctx->msg, "Loading vmod %s from %s (%s):\n",
nm, backup, path);
VSB_printf(ctx->msg, "dlopen() failed: %s\n", dlerror());
return (1);
}
......@@ -113,8 +114,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
if (d == NULL ||
d->file_id == NULL ||
strcmp(d->file_id, file_id)) {
VSB_printf(ctx->msg,
"Loading vmod %s from %s:\n", nm, path);
VSB_printf(ctx->msg, "Loading vmod %s from %s (%s):\n",
nm, backup, path);
VSB_printf(ctx->msg,
"This is no longer the same file seen by"
" the VCL-compiler.\n");
......@@ -129,8 +130,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
d->func_len <= 0 ||
d->proto == NULL ||
d->json == NULL) {
VSB_printf(ctx->msg,
"Loading VMOD %s from %s:\n", nm, path);
VSB_printf(ctx->msg, "Loading vmod %s from %s (%s):\n",
nm, backup, path);
VSB_printf(ctx->msg, "VMOD data is mangled.\n");
(void)dlclose(v->hdl);
FREE_OBJ(v);
......
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