trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch 8.0.x updated: Create lock file after changing to admin user for traffic_server
Date Tue, 26 Jun 2018 16:06:09 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new a281e09  Create lock file after changing to admin user for traffic_server
a281e09 is described below

commit a281e09decb17877b90977c35f71d61857cc9665
Author: Bryan Call <bcall@apache.org>
AuthorDate: Mon Jun 25 12:42:31 2018 -0700

    Create lock file after changing to admin user for traffic_server
    
    (cherry picked from commit c649ec70d13710bfe9020ffb3ff05ee1bbfb2f94)
---
 src/traffic_server/traffic_server.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/traffic_server/traffic_server.cc b/src/traffic_server/traffic_server.cc
index e444097..164c19d 100644
--- a/src/traffic_server/traffic_server.cc
+++ b/src/traffic_server/traffic_server.cc
@@ -1614,12 +1614,6 @@ main(int /* argc ATS_UNUSED */, const char **argv)
   // Local process manager
   initialize_process_manager();
 
-  // Ensure only one copy of traffic server is running, unless it's a command
-  // that doesn't require a lock.
-  if (!(command_valid && commands[command_index].no_process_lock)) {
-    check_lockfile();
-  }
-
   // Set the core limit for the process
   init_core_size();
   init_system();
@@ -1673,6 +1667,12 @@ main(int /* argc ATS_UNUSED */, const char **argv)
   }
 #endif
 
+  // Ensure only one copy of traffic server is running, unless it's a command
+  // that doesn't require a lock.
+  if (!(command_valid && commands[command_index].no_process_lock)) {
+    check_lockfile();
+  }
+
   // Can't generate a log message yet, do that right after Diags is
   // setup.
 


Mime
View raw message