Fix error message passing in Server::Start (#1225)

apache · Jan 15, 2023 · c01a5c1 · c01a5c1
1 parent f1f7c10
commit c01a5c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main.cc b/src/main.cc
@@ -319,8 +319,7 @@ int main(int argc, char *argv[]) {
     uint32_t ports[] = {config.port, config.tls_port, 0};
     for (uint32_t *port = ports; *port; ++port) {
       if (Util::IsPortInUse(*port)) {
-        LOG(ERROR) << "Could not create server TCP since the specified port[" << *port << "] is already in use"
-                   << std::endl;
+        LOG(ERROR) << "Could not create server TCP since the specified port[" << *port << "] is already in use";
         return 1;
       }
     }
@@ -351,6 +350,7 @@ int main(int argc, char *argv[]) {
   srv = &server;
   s = srv->Start();
   if (!s.IsOK()) {
+    LOG(ERROR) << "Failed to start server: " << s.Msg();
     return 1;
   }
   srv->Join();

diff --git a/src/server/server.cc b/src/server/server.cc
@@ -139,8 +139,7 @@ Status Server::Start() {
   if (config_->cluster_enabled) {
     auto s = cluster_->LoadClusterNodes(config_->NodesFilePath());
     if (!s.IsOK()) {
-      LOG(ERROR) << "Failed to load cluster nodes info: " << s.Msg();
-      return Status(Status::NotOK, s.Msg());
+      return s.Prefixed("failed to load cluster nodes info");
     }
     // Create objects used for slot migration
     slot_migrate_ =
@@ -149,8 +148,7 @@ Status Server::Start() {
     // Create migrating thread
     s = slot_migrate_->CreateMigrateHandleThread();
     if (!s.IsOK()) {
-      LOG(ERROR) << "Failed to create migration thread, Err: " << s.Msg();
-      return Status(Status::NotOK);
+      return s.Prefixed("failed to create migration thread");
     }
   }