check pid before init glog (#2278)

* check pid before init glog * compile error
vesoft-inc · Aug 7, 2020 · a5275b1 · a5275b1
1 parent 24a7142
commit a5275b1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
diff --git a/src/daemons/GraphDaemon.cpp b/src/daemons/GraphDaemon.cpp
@@ -33,6 +33,16 @@ static void printHelp(const char *prog);
 DECLARE_string(flagfile);
 
 int main(int argc, char *argv[]) {
+    // Detect if the server has already been started
+    // Check pid before glog init, in case of user may start daemon twice
+    // the 2nd will make the 1st failed to output log anymore
+    auto pidPath = FLAGS_pid_file;
+    auto status = ProcessUtils::isPidAvailable(pidPath);
+    if (!status.ok()) {
+        LOG(ERROR) << status;
+        return EXIT_FAILURE;
+    }
+
     google::SetVersionString(nebula::versionString());
     if (argc == 1) {
         printHelp(argv[0]);
@@ -53,15 +63,7 @@ int main(int argc, char *argv[]) {
     }
 
     // Setup logging
-    auto status = setupLogging();
-    if (!status.ok()) {
-        LOG(ERROR) << status;
-        return EXIT_FAILURE;
-    }
-
-    // Detect if the server has already been started
-    auto pidPath = FLAGS_pid_file;
-    status = ProcessUtils::isPidAvailable(pidPath);
+    status = setupLogging();
     if (!status.ok()) {
         LOG(ERROR) << status;
         return EXIT_FAILURE;

diff --git a/src/daemons/MetaDaemon.cpp b/src/daemons/MetaDaemon.cpp
@@ -159,6 +159,16 @@ Status initWebService(nebula::WebService* svc,
 }
 
 int main(int argc, char *argv[]) {
+    // Detect if the server has already been started
+    // Check pid before glog init, in case of user may start daemon twice
+    // the 2nd will make the 1st failed to output log anymore
+    auto pidPath = FLAGS_pid_file;
+    auto status = ProcessUtils::isPidAvailable(pidPath);
+    if (!status.ok()) {
+        LOG(ERROR) << status;
+        return EXIT_FAILURE;
+    }
+
     google::SetVersionString(nebula::versionString());
     folly::init(&argc, &argv, true);
     if (FLAGS_data_path.empty()) {
@@ -172,14 +182,6 @@ int main(int argc, char *argv[]) {
         google::SetStderrLogging(google::INFO);
     }
 
-    // Detect if the server has already been started
-    auto pidPath = FLAGS_pid_file;
-    auto status = ProcessUtils::isPidAvailable(pidPath);
-    if (!status.ok()) {
-        LOG(ERROR) << status;
-        return EXIT_FAILURE;
-    }
-
     if (FLAGS_daemonize) {
         status = ProcessUtils::daemonize(pidPath);
         if (!status.ok()) {

diff --git a/src/daemons/StorageDaemon.cpp b/src/daemons/StorageDaemon.cpp
@@ -33,22 +33,24 @@ static Status setupSignalHandler();
 std::unique_ptr<nebula::storage::StorageServer> gStorageServer;
 
 int main(int argc, char *argv[]) {
-    google::SetVersionString(nebula::versionString());
-    folly::init(&argc, &argv, true);
-    if (FLAGS_daemonize) {
-        google::SetStderrLogging(google::FATAL);
-    } else {
-        google::SetStderrLogging(google::INFO);
-    }
-
     // Detect if the server has already been started
+    // Check pid before glog init, in case of user may start daemon twice
+    // the 2nd will make the 1st failed to output log anymore
     auto pidPath = FLAGS_pid_file;
     auto status = ProcessUtils::isPidAvailable(pidPath);
     if (!status.ok()) {
         LOG(ERROR) << status;
         return EXIT_FAILURE;
     }
 
+    google::SetVersionString(nebula::versionString());
+    folly::init(&argc, &argv, true);
+    if (FLAGS_daemonize) {
+        google::SetStderrLogging(google::FATAL);
+    } else {
+        google::SetStderrLogging(google::INFO);
+    }
+
     if (FLAGS_daemonize) {
         status = ProcessUtils::daemonize(pidPath);
         if (!status.ok()) {