Mercurial > hg > release > heapstats-1.1

changeset 51:38c7e47cc6b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug 2879: Unnecessary varbind is sent in log collection trap. Reviewed-by: ykubota GitHub: https://github.com/HeapStats/heapstats/pull/22
author Yasumasa Suenaga <yasuenag@gmail.com>
date Tue, 15 Mar 2016 12:56:31 +0900
parents eecc75027c25
children 8b00cc1238ef
files agent/ChangeLog agent/src/logManager.cpp
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/agent/ChangeLog	Wed Feb 24 21:32:11 2016 +0900
+++ b/agent/ChangeLog	Tue Mar 15 12:56:31 2016 +0900
@@ -1,3 +1,7 @@
+2016-03-15 Yasumasa Suenaga  <yasuenag@gmail.com>
+
+	* Bug 2879: Unnecessary varbind is sent in log collection trap.
+
 2016-02-24 Yasumasa Suenaga  <yasuenag@gmail.com>
 
 	* Bug 2860: configure should regard $JAVA_HOME
--- a/agent/src/logManager.cpp	Wed Feb 24 21:32:11 2016 +0900
+++ b/agent/src/logManager.cpp	Tue Mar 15 12:56:31 2016 +0900
@@ -1140,7 +1140,6 @@
     if (arg.snmpSend) {
         /* Trap OID. */
         char trapOID[50]       = OID_LOGARCHIVE;
-        oid OID_ALERT_DATE[]   = {SNMP_OID_HEAPALERT,  1};
         oid OID_LOG_PATH[]     = {SNMP_OID_LOGARCHIVE, 1};
         oid OID_TROUBLE_DATE[] = {SNMP_OID_LOGARCHIVE, 2};
         /* Temporary buffer. */
@@ -1157,11 +1156,6 @@
             /* Setting trapOID. */
             sender.setTrapOID(trapOID);
             
-            /* Set alert date. */
-            snprintf(buff, 255, "%llu", (TMSecTime)getNowTimeSec());
-            sender.addValue(OID_ALERT_DATE, OID_LENGTH(OID_ALERT_DATE),
-                buff, SNMP_VAR_TYPE_COUNTER64);
-            
             /* Set log archive path. */
             sender.addValue(OID_LOG_PATH, OID_LENGTH(OID_LOG_PATH),
                 realSendPath, SNMP_VAR_TYPE_STRING);