1 files changed, 23 insertions, 26 deletions

diff --git a/src/core/function/basic/SingletonStorage.cpp b/src/core/function/basic/SingletonStorage.cpp
index 4786ad93..73e19ddd 100644
--- a/src/core/function/basic/SingletonStorage.cpp
+++ b/src/core/function/basic/SingletonStorage.cpp
@@ -52,7 +52,7 @@ class SingletonStorage::Impl {
       std::shared_lock<std::shared_mutex> lock(instances_mutex_);
       ins_it = instances_map_.find(channel);
       if (ins_it == instances_map_.end()) {
-        SPDLOG_TRACE("cannot find channel object, channel :{}", channel);
+        SPDLOG_TRACE("cannot find channel object, channel: {}", channel);
         return nullptr;
       }
       return ins_it->second.get();
@@ -70,35 +70,32 @@ class SingletonStorage::Impl {
 
   auto SetObjectInChannel(int channel, ChannelObjectPtr p_obj)
       -> GpgFrontend::ChannelObject* {
-    {
-      SPDLOG_TRACE("set channel object, type: {} in channel: {}, address: {}",
-                   typeid(p_obj.get()).name(), channel,
-                   static_cast<void*>(p_obj.get()));
-
-      assert(p_obj != nullptr);
-      if (p_obj == nullptr) {
-        SPDLOG_ERROR("cannot set a nullptr as a channel obejct of channel: {}",
-                     channel);
-        return nullptr;
-      }
-
-      p_obj->SetChannel(channel);
-      auto* raw_obj = p_obj.get();
+    SPDLOG_TRACE("set channel object, type: {} in channel: {}, address: {}",
+                 typeid(p_obj.get()).name(), channel,
+                 static_cast<void*>(p_obj.get()));
+
+    assert(p_obj != nullptr);
+    if (p_obj == nullptr) {
+      SPDLOG_ERROR("cannot set a nullptr as a channel obejct of channel: {}",
+                   channel);
+      return nullptr;
+    }
 
-      {
-        SPDLOG_TRACE(
-            "register channel object to instances map, "
-            "channel: {}, address: {}",
-            channel, static_cast<void*>(p_obj.get()));
-        std::unique_lock<std::shared_mutex> lock(instances_mutex_);
-        instances_map_[channel] = std::move(p_obj);
-      }
+    p_obj->SetChannel(channel);
+    auto* raw_obj = p_obj.get();
 
+    {
       SPDLOG_TRACE(
-          "set channel: {} success, current channel object address: {}",
-          channel, static_cast<void*>(raw_obj));
-      return raw_obj;
+          "register channel object to instances map, "
+          "channel: {}, address: {}",
+          channel, static_cast<void*>(p_obj.get()));
+      std::unique_lock<std::shared_mutex> lock(instances_mutex_);
+      instances_map_[channel] = std::move(p_obj);
     }
+
+    SPDLOG_TRACE("set channel: {} success, current channel object address: {}",
+                 channel, static_cast<void*>(raw_obj));
+    return raw_obj;
   }
 
  private: