trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject git commit: TS-1834: logstats fails with a missing log directory
Date Wed, 24 Apr 2013 22:18:10 GMT
Updated Branches:
  refs/heads/master 9f4429d25 -> d9275d7fe


TS-1834: logstats fails with a missing log directory

traffic_logstats fails when the log directory is missing or not
configured. But really, we only need the log directory in incremental
mode.


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

Branch: refs/heads/master
Commit: d9275d7feb8c1807afd85459b387ef62e01ed6d5
Parents: 9f4429d
Author: James Peach <jpeach@apache.org>
Authored: Wed Apr 24 15:16:42 2013 -0700
Committer: James Peach <jpeach@apache.org>
Committed: Wed Apr 24 15:18:04 2013 -0700

----------------------------------------------------------------------
 proxy/logstats.cc |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d9275d7f/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 8b4480c..9789316 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -2265,14 +2265,6 @@ main(int /* argc ATS_UNUSED */, char *argv[])
   origin_set = NULL;
   parse_errors = 0;
 
-  // Get log directory
-  ink_strlcpy(system_log_dir, Layout::get()->logdir, sizeof(system_log_dir));
-  if (-1 == access(system_log_dir, R_OK)) {
-    fprintf(stderr, "unable to change to log directory \"%s\" [%d '%s']\n", system_log_dir,
errno, strerror(errno));
-    fprintf(stderr, " please set correct path in env variable TS_ROOT \n");
-    exit(1);
-  }
-
   // Command line parsing
   cl.parse_arguments(argv);
 
@@ -2355,15 +2347,21 @@ main(int /* argc ATS_UNUSED */, char *argv[])
       std::cout << "[" << std::endl;
   }
 
-  // Change directory to the log dir
-  if (chdir(system_log_dir) < 0) {
-    exit_status.set(EXIT_CRITICAL, " can't chdir to ");
-    exit_status.append(system_log_dir);
-    my_exit(exit_status);
-  }
-
+  // Do the incremental parse of the default squid log.
   if (cl.incremental) {
-    // Do the incremental parse of the default squid log.
+    // Get log directory
+    if (Layout::get()->logdir) {
+      exit_status.set(EXIT_CRITICAL, " missing log directory configuration");
+      my_exit(exit_status);
+    }
+
+    // Change directory to the log dir
+    if (chdir(system_log_dir) < 0) {
+      exit_status.set(EXIT_CRITICAL, " can't chdir to ");
+      exit_status.append(system_log_dir);
+      my_exit(exit_status);
+    }
+
     std::string sf_name(system_log_dir);
     struct stat stat_buf;
     int state_fd;
@@ -2396,7 +2394,6 @@ main(int /* argc ATS_UNUSED */, char *argv[])
     lck.l_start = (off_t)0;
     lck.l_len = (off_t)0; /* till end of file*/
     cnt = 10;
-    // while (((res = flock(state_fd, LOCK_EX | LOCK_NB)) < 0) && --cnt) {
     while (((res = fcntl(state_fd, F_SETLK, &lck)) < 0) && --cnt) {
       switch (errno) {
       case EWOULDBLOCK:


Mime
View raw message