Changeset 1d9338a in nscp for modules/FileLogger

Timestamp:

05/23/05 21:24:32 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

6654022

Parents:

af5bc4b

Message:

2005-05-23 MickeM

+ Added obfuscated password support
+ Added some more debug info on commands (returncode, and input args)
+ Added some more comments ot the NSC.ini
+ Added central password "override"
+ Added central "host override"
+ Fixed bug with external commands always getting WARNING state

2005-05-22 MickeM

+ Added debug outout for command
+ Added timestamps for log-to-file (date_mask to configure format)
+ Added support for "no password" with check_nt
+ Added log of bad password on NSClient requests.

• Some threading issues fixed (I hate threading :)

Location:

modules/FileLogger

Files:

• FileLogger.cpp (modified) (4 diffs)
• FileLogger.h (modified) (2 diffs)

modules/FileLogger/FileLogger.cpp

@@ -4 +4 @@
 #include "stdafx.h"
 #include "FileLogger.h"
+
+#include <sys/timeb.h>
+#include <time.h>
 
 FileLogger gFileLogger;
@@ -18 +21 @@
 }
 
+std::string FileLogger::getFileName()
+{
+  if (file_.empty()) {
+    file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+    if (file_.find("\\") == std::string::npos)
+      file_ = NSCModuleHelper::getBasePath() + "\\" + file_;
+  }
+  return file_;
+}
+
 bool FileLogger::loadModule() {
-  file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+  _tzset();
+  getFileName();
+  format_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_DATEMASK, LOG_DATEMASK_DEFAULT);
   return true;
 }
@@ -26 +41 @@
 }
 std::string FileLogger::getModuleName() {
-  return "File logger: " + NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+  return "File logger: " + getFileName();
 }
 NSCModuleWrapper::module_version FileLogger::getModuleVersion() {
@@ -39 +54 @@
 }
 void FileLogger::handleMessage(int msgType, char* file, int line, char* message) {
+  char buffer[64];
   std::ofstream stream(file_.c_str(), std::ios::app);
-  stream << NSCHelper::translateMessageType(msgType) << ":" << file << ":" << line << ": " << message << std::endl;
+  __time64_t ltime;
+  _time64( &ltime );
+  struct tm *today = _localtime64( &ltime );
+  if (today) {
+    int len = strftime(buffer, 63, format_.c_str(), today);
+    if ((len < 1)||(len > 64))
+      strncpy(buffer, "???", 63);
+    else
+      buffer[len] = 0;
+  } else {
+    strncpy(buffer, "???", 63);
+  }
+  stream << buffer << ": " << NSCHelper::translateMessageType(msgType) << ":" << file << ":" << line << ": " << message << std::endl;
 }
 

modules/FileLogger/FileLogger.h

@@ -6 +6 @@
 private:
   std::string file_;
+  std::string format_;
 
 public:
@@ -19 +20 @@
   void handleMessage(int msgType, char* file, int line, char* message);
   int handleCommand(char* command, char **argument, char *returnBuffer, int returnBufferLen);
+
+
+  std::string getFileName();
 };