Fix log packer command

FairRootGroup · Jan 11, 2024 · c5428ef · c5428ef
1 parent e9b0abb
commit c5428ef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/dds-agent/src/CommanderChannel.cpp b/dds-agent/src/CommanderChannel.cpp
@@ -391,7 +391,7 @@ bool CCommanderChannel::on_cmdGET_LOG(SCommandAttachmentImpl<cmdGET_LOG>::ptr_t
 
         stringstream ssCmd;
         ssCmd << bashPath.string() << " -c \"" << findPath.string() << " \\\"" << logDir.string()
-              << "\\\" -depth 1 -type f -name \\\"*.log\\\" -exec basename {} \\; | " << tarPath.string()
+              << "\\\" -maxdepth 1 -type f -name \\\"*.log\\\" -exec basename {} \\; | " << tarPath.string()
               << " -czf \\\"" << filePath.string() << "\\\" --directory \\\"" << logDir.string() << "\\\" -T -\"";
 
         string output;

diff --git a/dds-protocol-lib/src/BaseSMChannelImpl.h b/dds-protocol-lib/src/BaseSMChannelImpl.h
@@ -195,11 +195,11 @@ namespace dds
 
           protected:
             CBaseSMChannelImpl(boost::asio::io_context& _service,
-                                  const std::string& _inputName,
-                                  const std::string& _outputName,
-                                  uint64_t _protocolHeaderID,
-                                  EMQOpenType _inputOpenType,
-                                  EMQOpenType _outputOpenType)
+                               const std::string& _inputName,
+                               const std::string& _outputName,
+                               uint64_t _protocolHeaderID,
+                               EMQOpenType _inputOpenType,
+                               EMQOpenType _outputOpenType)
                 : CChannelMessageHandlersImpl()
                 , m_isShuttingDown(false)
                 , m_started(false)
@@ -210,11 +210,11 @@ namespace dds
             }
 
             CBaseSMChannelImpl(boost::asio::io_context& _service,
-                                  const std::vector<std::string>& _inputNames,
-                                  const std::string& _outputName,
-                                  uint64_t _protocolHeaderID,
-                                  EMQOpenType _inputOpenType,
-                                  EMQOpenType _outputOpenType)
+                               const std::vector<std::string>& _inputNames,
+                               const std::string& _outputName,
+                               uint64_t _protocolHeaderID,
+                               EMQOpenType _inputOpenType,
+                               EMQOpenType _outputOpenType)
                 : CChannelMessageHandlersImpl()
                 , m_isShuttingDown(false)
                 , m_started(false)

diff --git a/dds-protocol-lib/src/ClientChannelImpl.h b/dds-protocol-lib/src/ClientChannelImpl.h
@@ -20,9 +20,7 @@ namespace dds
         class CClientChannelImpl : public CBaseChannelImpl<T>
         {
           protected:
-            CClientChannelImpl(boost::asio::io_context& _service,
-                                  EChannelType _channelType,
-                                  uint64_t _protocolHeaderID)
+            CClientChannelImpl(boost::asio::io_context& _service, EChannelType _channelType, uint64_t _protocolHeaderID)
                 : CBaseChannelImpl<T>(_service, _protocolHeaderID)
             {
                 this->m_channelType = _channelType;