You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2015/07/10 18:16:22 UTC

trafficserver git commit: TS-3435: Fix configuration so it is not called for logstats.

Repository: trafficserver
Updated Branches:
  refs/heads/master bad88d0e8 -> 4f32de3c1


TS-3435: Fix configuration so it is not called for logstats.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4f32de3c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4f32de3c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4f32de3c

Branch: refs/heads/master
Commit: 4f32de3c1c7ce5cb9feb5274ef30a5143316b5cf
Parents: bad88d0
Author: Alan M. Carroll <so...@yahoo-inc.com>
Authored: Fri Jul 10 11:12:07 2015 -0500
Committer: Alan M. Carroll <so...@yahoo-inc.com>
Committed: Fri Jul 10 11:12:07 2015 -0500

----------------------------------------------------------------------
 proxy/logging/Log.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4f32de3c/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 6ab3862..512ca9c 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -825,20 +825,20 @@ Log::init(int flags)
       } else {
         logging_mode = (LoggingMode)val;
       }
+      // periodic task interval are set on a per instance basis
+      MgmtInt pti = REC_ConfigReadInteger("proxy.config.log.periodic_tasks_interval");
+      if (pti <= 0) {
+        Error("proxy.config.log.periodic_tasks_interval = %" PRId64 " is invalid", pti);
+        Note("falling back to default periodic tasks interval = %d", PERIODIC_TASKS_INTERVAL_FALLBACK);
+        periodic_tasks_interval = PERIODIC_TASKS_INTERVAL_FALLBACK;
+      } else {
+        periodic_tasks_interval = static_cast<uint32_t>(pti);
+      }
+
+      REC_RegisterConfigUpdateFunc("proxy.config.log.periodic_tasks_interval", &Log::handle_periodic_tasks_int_change, NULL);
     }
   }
 
-  // periodic task interval are set on a per instance basis
-  int pti = (int)REC_ConfigReadInteger("proxy.config.log.periodic_tasks_interval");
-  if (pti <= 0) {
-    Error("proxy.config.log.periodic_tasks_interval = %d is invalid", pti);
-    Note("falling back to default periodic tasks interval = %d", PERIODIC_TASKS_INTERVAL_FALLBACK);
-    periodic_tasks_interval = PERIODIC_TASKS_INTERVAL_FALLBACK;
-  } else
-    periodic_tasks_interval = (uint32_t)pti;
-
-  REC_RegisterConfigUpdateFunc("proxy.config.log.periodic_tasks_interval", &Log::handle_periodic_tasks_int_change, NULL);
-
   // if remote management is enabled, do all necessary initialization to
   // be able to handle a logging mode change
   //