next build number; additional debug in logwatch subagent
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 26 May 2015 15:52:30 +0000 (18:52 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 26 May 2015 15:52:30 +0000 (18:52 +0300)
android/src/agent/res/values/build_number.xml
android/src/console/res/values/build_number.xml
build/build_number
include/build.h
src/java/build/set_build_number.cmd
src/java/client/netxms-base/src/main/java/org/netxms/base/BuildNumber.java
src/libnxlp/wevt.cpp

index ca7b19b..1a44c52 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-       <string name="build_number">8020</string>
+       <string name="build_number">8021</string>
 </resources>
index ca7b19b..1a44c52 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-       <string name="build_number">8020</string>
+       <string name="build_number">8021</string>
 </resources>
index 274eb1a..72ac185 100644 (file)
@@ -1 +1 @@
-8020
+8021
index 664e49e..de013cf 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef __build_h
 #define __build_h
-#define NETXMS_VERSION_BUILD 8020
-#define NETXMS_VERSION_BUILD_STRING _T("8020")
+#define NETXMS_VERSION_BUILD 8021
+#define NETXMS_VERSION_BUILD_STRING _T("8021")
 #endif
index 92b2ec5..24eaa93 100644 (file)
@@ -1,5 +1,5 @@
 package org.netxms.base;
 public final class BuildNumber {
-   public static final String TEXT = "8020";
-   public static final int NUMBER = 8020;
+   public static final String TEXT = "8021";
+   public static final int NUMBER = 8021;
 }
index 7c30373..32f9cde 100644 (file)
@@ -217,10 +217,11 @@ bool LogParser::monitorEventLogV6(CONDITION stopCondition)
       time_t now = time(NULL);
       if (startTime < now)
       {
-                  LogParserTrace(1, _T("LogWatch: reading old events between %I64d and %I64d"), (INT64)startTime, (INT64)now);
+                  LogParserTrace(1, _T("LogWatch: reading old events between %I64d and %I64d from %s"), (INT64)startTime, (INT64)now, &m_fileName[1]);
 
          WCHAR query[256];
          _snwprintf(query, 256, L"*[System/TimeCreated[timediff(@SystemTime) < %I64d]]", (INT64)(now - startTime) * 1000LL);
+         LogParserTrace(2, _T("LogWatch: event log query: \"%s\""), query);
          EVT_HANDLE handle = _EvtQuery(NULL, &m_fileName[1], query, EvtQueryChannelPath | EvtQueryForwardDirection);
          if (handle != NULL)
          {