Author: Sean Critica <sean.critica@gmail.com>

Bug 2943: ICAP tokens not logged when using multiple access

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index b8a4b3e69117e45fec16a7c168337f2c1bd4d476..db921999c0b397fb9def515a8921eb17d2c79541 100644 (file)
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -2137,6 +2137,13 @@ accessLogInit(void)
 
     assert(sizeof(log_tags) == (LOG_TYPE_MAX + 1) * sizeof(char *));
 
+#if USE_ADAPTATION
+       alLogformatHasAdaptToken = false;
+#endif
+#if ICAP_CLIENT
+       alLogformatHasIcapToken = false;
+#endif
+
     for (log = Config.Log.accesslogs; log; log = log->next) {
         if (log->type == CLF_NONE)
             continue;
@@ -2145,12 +2152,6 @@ accessLogInit(void)
 
         LogfileStatus = LOG_ENABLE;
 
-#if USE_ADAPTATION
-        alLogformatHasAdaptToken = false;
-#endif
-#if ICAP_CLIENT
-        alLogformatHasIcapToken = false;
-#endif
 #if USE_ADAPTATION || ICAP_CLIENT
         for (logformat_token * curr_token = (log->logFormat?log->logFormat->format:NULL); curr_token; curr_token = curr_token->next) {
 #if USE_ADAPTATION