refactor(Core/Misc): string handling and use smart pointer for strand (#22351)

2 files changed, 5 insertions, 5 deletions

diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index 37809458b8..2b473a8731 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -29,6 +29,7 @@
 #include "Timer.h"
 #include "Tokenize.h"
 #include <chrono>
+#include <memory>
 
 Log::Log() : AppenderId(0), highestLogLevel(LOG_LEVEL_FATAL)
 {
@@ -39,7 +40,6 @@ Log::Log() : AppenderId(0), highestLogLevel(LOG_LEVEL_FATAL)
 
 Log::~Log()
 {
-    delete _strand;
     Close();
 }
 
@@ -369,7 +369,7 @@ void Log::Initialize(Acore::Asio::IoContext* ioContext)
     if (ioContext)
     {
         _ioContext = ioContext;
-        _strand = new Acore::Asio::Strand(*ioContext);
+        _strand = std::make_unique<Acore::Asio::Strand>(*ioContext);
     }
 
     LoadFromConfig();
@@ -377,8 +377,7 @@ void Log::Initialize(Acore::Asio::IoContext* ioContext)
 
 void Log::SetSynchronous()
 {
-    delete _strand;
-    _strand = nullptr;
+    _strand.reset();
     _ioContext = nullptr;
 }
 
diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
index 90546bc226..2cf588ccac 100644
--- a/src/common/Logging/Log.h
+++ b/src/common/Logging/Log.h
@@ -24,6 +24,7 @@
 #include "StringFormat.h"
 #include <unordered_map>
 #include <vector>
+#include <memory>
 
 class Appender;
 class Logger;
@@ -120,7 +121,7 @@ private:
     std::string m_logsTimestamp;
 
     Acore::Asio::IoContext* _ioContext;
-    Acore::Asio::Strand* _strand;
+    std::unique_ptr<Acore::Asio::Strand> _strand;
 };
 
 #define sLog Log::instance()