Changeset ec3fbc5 in nscp for modules

Timestamp:

02/22/06 23:25:11 (7 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

f42280d

Parents:

1b7ae3d

Message:

Added syntax option and some date formating code.

Location:

modules/CheckEventLog

Files:

• CheckEventLog.cpp (modified) (4 diffs)
• CheckEventLog.h (modified) (1 diff)

modules/CheckEventLog/CheckEventLog.cpp

@@ -147 +147 @@
     return strEx::itos(dwType);
   }
+  std::string render(std::string syntax) {
+    strEx::replace(syntax, "%source%", eventSource());
+    strEx::replace(syntax, "%generated%", strEx::format_date(pevlr_->TimeGenerated, DATE_FORMAT));
+    strEx::replace(syntax, "%written%", strEx::format_date(pevlr_->TimeWritten, DATE_FORMAT));
+    strEx::replace(syntax, "%type%", translateType(eventType()));
+    strEx::replace(syntax, "%severity%", translateSeverity(severity()));
+    strEx::replace(syntax, "%strings%", enumStrings());
+    strEx::replace(syntax, "%id%", strEx::itos(eventID()));
+    return syntax;
+  }
 };
 
@@ -203 +213 @@
   bool bShowDescriptions = false;
   unsigned int truncate = 0;
+  std::string syntax;
 
   try {
@@ -212 +223 @@
       MAP_OPTIONS_BOOL_EX("filter", bFilterIn, "in", "out")
       MAP_OPTIONS_BOOL_EX("filter", bFilterAll, "all", "any")
+      MAP_OPTIONS_STR("syntax", syntax)
       MAP_FILTER("filter-eventType", eventType)
       MAP_FILTER("filter-severity", eventSeverity)
@@ -273 +285 @@
 
         if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) {
-          strEx::append_list(message, record.eventSource());
-          if (bShowDescriptions) {
+          if (!syntax.empty()) {
+            strEx::append_list(message, record.render(syntax));
+          } else if (bShowDescriptions) {
+            strEx::append_list(message, record.eventSource());
+          } else {
+            strEx::append_list(message, record.eventSource());
             message += "(" + EventLogRecord::translateType(record.eventType()) + ", " + strEx::itos(record.eventID()) + ", " + EventLogRecord::translateSeverity(record.severity()) + ")";
             message += "[" + record.enumStrings() + "]";

modules/CheckEventLog/CheckEventLog.h

@@ -4 +4 @@
 #include <checkHelpers.hpp>
 #include <filter_framework.hpp>
+
+
+#define DATE_FORMAT "%#c"
 
 class CheckEventLog {