Finalize adaptation configuration after the config file was parsed.

We may want to make this code adaptation-method-agnostic, but it is not
clear whether hiding adaptation methods from main() is worth the trouble.

diff --git a/src/main.cc b/src/main.cc
index c03a20136722c72d2869aa755dc230a11c7c2e85..796bb92a5b43763e3b136dec418a469d57e353fc 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -70,6 +70,13 @@
 #include "MemPool.h"
 #include "ICMPSquid.h"
 
+#if ICAP_CLIENT
+#include "ICAP/ICAPConfig.h"
+#endif
+#if USE_ADAPTATION
+#include "adaptation/Config.h"
+#endif
+
 #if USE_WIN32_SERVICE
 
 #include "squid_windows.h"
@@ -1078,6 +1085,14 @@ mainInitialize(void)
 
     memCheckInit();
 
+#if ICAP_CLIENT
+    TheICAPConfig.finalize(); // must be after we load modules
+#endif
+#if USE_ADAPTATION
+    Adaptation::Config::Finalize(); // must be last adaptation-related finalize
+#endif
+
+
     debugs(1, 1, "Ready to serve requests.");
 
     if (!configured_once) {