Commit ef23612b authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Do not emit 'VCL compiled' message during argv VCL loading

parent 3dd6aa06
...@@ -384,8 +384,6 @@ mgt_VccCompile(struct cli *cli, struct vclprog *vcl, const char *vclname, ...@@ -384,8 +384,6 @@ mgt_VccCompile(struct cli *cli, struct vclprog *vcl, const char *vclname,
AN(p); AN(p);
mgt_vcl_symtab(vcl, p); mgt_vcl_symtab(vcl, p);
VCLI_Out(cli, "VCL compiled.\n");
REPLACE(p, VSB_data(vp->libfile)); REPLACE(p, VSB_data(vp->libfile));
mgt_vcc_fini_vp(vp, 1); mgt_vcc_fini_vp(vp, 1);
return (p); return (p);
......
...@@ -421,7 +421,7 @@ mgt_vcl_setstate(struct cli *cli, struct vclprog *vp, const struct vclstate *vs) ...@@ -421,7 +421,7 @@ mgt_vcl_setstate(struct cli *cli, struct vclprog *vp, const struct vclstate *vs)
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
static void static int
mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc, mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
const char *vclsrcfile, const char *state, int C_flag) const char *vclsrcfile, const char *state, int C_flag)
{ {
...@@ -437,7 +437,7 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc, ...@@ -437,7 +437,7 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
VCLI_Out(cli, "Too many (%d) VCLs already loaded\n", vcl_count); VCLI_Out(cli, "Too many (%d) VCLs already loaded\n", vcl_count);
VCLI_Out(cli, "(See max_vcl and max_vcl_handling parameters)"); VCLI_Out(cli, "(See max_vcl and max_vcl_handling parameters)");
VCLI_SetResult(cli, CLIS_CANT); VCLI_SetResult(cli, CLIS_CANT);
return; return (0);
} }
if (state == NULL) if (state == NULL)
...@@ -446,13 +446,13 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc, ...@@ -446,13 +446,13 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
vs = mcf_vcl_parse_state(cli, state); vs = mcf_vcl_parse_state(cli, state);
if (vs == NULL) if (vs == NULL)
return; return (0);
vp = mgt_vcl_add(vclname, vs); vp = mgt_vcl_add(vclname, vs);
lib = mgt_VccCompile(cli, vp, vclname, vclsrc, vclsrcfile, C_flag); lib = mgt_VccCompile(cli, vp, vclname, vclsrc, vclsrcfile, C_flag);
if (lib == NULL) { if (lib == NULL) {
mgt_vcl_del(vp); mgt_vcl_del(vp);
return; return (0);
} }
AZ(C_flag); AZ(C_flag);
...@@ -470,7 +470,7 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc, ...@@ -470,7 +470,7 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
} }
if (!MCH_Running()) if (!MCH_Running())
return; return (0);
if (mgt_cli_askchild(&status, &p, "vcl.load %s %s %d%s\n", if (mgt_cli_askchild(&status, &p, "vcl.load %s %s %d%s\n",
vp->name, vp->fname, vp->warm, vp->state->name)) { vp->name, vp->fname, vp->warm, vp->state->name)) {
...@@ -478,11 +478,12 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc, ...@@ -478,11 +478,12 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
VCLI_Out(cli, "%s", p); VCLI_Out(cli, "%s", p);
VCLI_SetResult(cli, status); VCLI_SetResult(cli, status);
free(p); free(p);
return; return (0);
} }
free(p); free(p);
mgt_vcl_set_cooldown(vp, VTIM_mono()); mgt_vcl_set_cooldown(vp, VTIM_mono());
return (1);
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -501,7 +502,7 @@ mgt_vcl_startup(struct cli *cli, const char *vclsrc, const char *vclname, ...@@ -501,7 +502,7 @@ mgt_vcl_startup(struct cli *cli, const char *vclsrc, const char *vclname,
vclname = buf; vclname = buf;
} }
active_vcl = NULL; active_vcl = NULL;
mgt_new_vcl(cli, vclname, vclsrc, origin, NULL, C_flag); (void)mgt_new_vcl(cli, vclname, vclsrc, origin, NULL, C_flag);
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -571,7 +572,8 @@ mcf_vcl_inline(struct cli *cli, const char * const *av, void *priv) ...@@ -571,7 +572,8 @@ mcf_vcl_inline(struct cli *cli, const char * const *av, void *priv)
if (!mcf_find_no_vcl(cli, av[2])) if (!mcf_find_no_vcl(cli, av[2]))
return; return;
mgt_new_vcl(cli, av[2], av[3], "<vcl.inline>", av[4], 0); if (!mgt_new_vcl(cli, av[2], av[3], "<vcl.inline>", av[4], 0))
VCLI_Out(cli, "VCL compiled.\n");
} }
static void v_matchproto_(cli_func_t) static void v_matchproto_(cli_func_t)
...@@ -582,7 +584,8 @@ mcf_vcl_load(struct cli *cli, const char * const *av, void *priv) ...@@ -582,7 +584,8 @@ mcf_vcl_load(struct cli *cli, const char * const *av, void *priv)
if (!mcf_find_no_vcl(cli, av[2])) if (!mcf_find_no_vcl(cli, av[2]))
return; return;
mgt_new_vcl(cli, av[2], NULL, av[3], av[4], 0); if (!mgt_new_vcl(cli, av[2], NULL, av[3], av[4], 0))
VCLI_Out(cli, "VCL compiled.\n");
} }
......
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