From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 30 Mar 2008 19:44:37 +0000 (-0600)
Subject: Finalize adaptation configuration after the config file was parsed.
X-Git-Tag: SQUID_3_1_0_1~49^2~302^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b958cb0fceeb5d0bf295ea88dcb73eab5007ef2e;p=thirdparty%2Fsquid.git

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 c03a201367..796bb92a5b 100644
--- 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) {