fix: fixes status report

wazuh · Jan 9, 2025 · b7a3076 · b7a3076
1 parent 5bf057b
commit b7a3076
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/agent/src/process_options_unix.cpp b/src/agent/src/process_options_unix.cpp
@@ -36,5 +36,5 @@ void StartAgent(const std::string& configFilePath)
 
 void StatusAgent(const std::string& configFilePath)
 {
-    std::cout << fmt::format("wazuh-agent is {}\n", unix_daemon::GetDaemonStatus(configFilePath));
+    std::cout << fmt::format("wazuh-agent status: {}\n", unix_daemon::GetDaemonStatus(configFilePath));
 }
diff --git a/src/agent/src/unix/unix_daemon.cpp b/src/agent/src/unix/unix_daemon.cpp
@@ -6,6 +6,7 @@
 
 #include <cerrno>
 #include <filesystem>
+#include <fmt/format.h>
 #include <fstream>
 #include <sys/file.h>
 #include <unistd.h>
@@ -24,6 +25,7 @@ namespace unix_daemon
 {
     LockFileHandler::LockFileHandler(std::string lockFilePath)
         : m_lockFilePath(std::move(lockFilePath))
+        , m_errno(0)
         , m_lockFileCreated(createLockFile())
     {
     }
@@ -77,13 +79,15 @@ namespace unix_daemon
         int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644);
         if (fd == -1)
         {
-            LogError("Unable to open lock file: {}. Error: {} ({})", filename.c_str(), errno, std::strerror(errno));
+            m_errno = errno;
+            LogError("Unable to open lock file: {}. Error: {} ({})", filename.c_str(), m_errno, std::strerror(m_errno));
             return false;
         }
 
         if (flock(fd, LOCK_EX | LOCK_NB) == -1)
         {
-            LogDebug("Unable to lock lock file: {}. Error: {} ({})", filename.c_str(), errno, std::strerror(errno));
+            m_errno = errno;
+            LogDebug("Unable to lock lock file: {}. Error: {} ({})", filename.c_str(), m_errno, std::strerror(m_errno));
             close(fd);
             return false;
         }
@@ -111,7 +115,15 @@ namespace unix_daemon
 
         if (!lockFileHandler.isLockFileCreated())
         {
-            return "running";
+            if (lockFileHandler.getErrno() == EAGAIN)
+            {
+                return "running";
+            }
+            else
+            {
+                return fmt::format(
+                    "Error: {} ({})", lockFileHandler.getErrno(), std::strerror(lockFileHandler.getErrno()));
+            }
         }
 
         return "stopped";

diff --git a/src/agent/src/unix/unix_daemon.hpp b/src/agent/src/unix/unix_daemon.hpp
@@ -28,6 +28,13 @@ namespace unix_daemon
             return m_lockFileCreated;
         }
 
+        /// @brief Returns the errno from the latest attempt to create/lock the lock-file
+        /// @return The errno
+        int getErrno() const
+        {
+            return m_errno;
+        }
+
     private:
         /// @brief Creates the directory path for the lock file
         /// @param path The path for the lock file
@@ -43,6 +50,9 @@ namespace unix_daemon
 
         std::string m_lockFilePath;
 
+        /// @brief Holds the errno from the lock-file create/lock attempt
+        int m_errno;
+
         /// @brief Indicates the lock file was created by this instance of the LockFileHandler
         bool m_lockFileCreated;
     };