[master] 96232c8 Initialize stevedores before the VCC
Poul-Henning Kamp
phk at FreeBSD.org
Wed May 18 23:59:06 CEST 2016
commit 96232c8869b36d98c43af116436cff48cca372e7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed May 18 21:57:41 2016 +0000
Initialize stevedores before the VCC
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index d696839..7e598b5 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -747,6 +747,13 @@ main(int argc, char * const *argv)
P_arg, strerror(errno));
VJ_master(JAIL_MASTER_LOW);
+ /* If no -s argument specified, process default -s argument */
+ if (!s_arg_given)
+ STV_Config(s_arg);
+
+ /* Configure Transient storage, if user did not */
+ STV_Config_Transient();
+
mgt_vcl_init();
if (b_arg != NULL || f_arg != NULL) {
@@ -778,13 +785,6 @@ main(int argc, char * const *argv)
}
}
- /* If no -s argument specified, process default -s argument */
- if (!s_arg_given)
- STV_Config(s_arg);
-
- /* Configure Transient storage, if user did not */
- STV_Config_Transient();
-
HSH_config(h_arg);
Wait_config(W_arg);
More information about the varnish-commit
mailing list