统一各系统进程退出码

lanthora · Dec 3, 2023 · 5f39f7c · 5f39f7c
1 parent ba2210b
commit 5f39f7c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/posix.cc b/src/main/posix.cc
@@ -150,6 +150,7 @@ struct argp config = {
     .parser = parseOption,
 };
 
+volatile int exitCode = 0;
 bool running = true;
 std::mutex mutex;
 std::condition_variable condition;
@@ -191,6 +192,7 @@ std::string getLastestAddress(const std::string &name) {
 
 namespace Candy {
 void shutdown() {
+    exitCode = 1;
     signalHandler(SIGTERM);
 }
 } // namespace Candy
@@ -219,8 +221,6 @@ int main(int argc, char *argv[]) {
         client.run();
     }
 
-    spdlog::info("service started successfully");
-
     std::signal(SIGINT, signalHandler);
     std::signal(SIGTERM, signalHandler);
 
@@ -236,9 +236,13 @@ int main(int argc, char *argv[]) {
         saveLatestAddress(arguments.name, client.getAddress());
     }
 
-    spdlog::info("service stopped successfully");
+    if (exitCode == 0) {
+        spdlog::info("service exit: normal");
+    } else {
+        spdlog::warn("service exit: internal exception");
+    }
 
-    return 0;
+    return exitCode;
 }
 
 #endif
diff --git a/src/main/windows.cc b/src/main/windows.cc
@@ -122,8 +122,6 @@ int main() {
         client.run();
     }
 
-    spdlog::info("service started successfully");
-
     signal(SIGINT, signalHandler);
     signal(SIGTERM, signalHandler);
 
@@ -141,8 +139,12 @@ int main() {
 
     windowsNetworkCleanup();
 
-    spdlog::info("service stopped successfully");
-    spdlog::info("exit code: {}", exitCode);
+    if (exitCode == 0) {
+        spdlog::info("service exit: normal");
+    } else {
+        spdlog::warn("service exit: internal exception");
+    }
+
     return exitCode;
 }