[SVN-NetXMS] revision 3383

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3383
Author:victor

Date:2008-07-17 21:52:48 +0300 (Thu, 17 Jul 2008)

Comment:fixed some bugs in alarm timeout code; other minor changes

Changes
U trunk/include/netxmsdb.h
U trunk/src/server/core/alarm.cpp
U trunk/src/server/libnxsrv/agent.cpp
U trunk/src/server/tools/nxdbmgr/upgrade.cpp

Diff
Modified: trunk/include/netxmsdb.h
===================================================================
--- trunk/include/netxmsdb.h 2008-07-17 18:30:20 UTC (rev 3382)
+++ trunk/include/netxmsdb.h 2008-07-17 18:52:48 UTC (rev 3383)
@@ -24,6 +24,6 @@
 #ifndef _netxmsdb_h
 #define _netxmsdb_h
 
-#define DB_FORMAT_VERSION 82
+#define DB_FORMAT_VERSION 83
 
 #endif

Modified: trunk/src/server/core/alarm.cpp
===================================================================
--- trunk/src/server/core/alarm.cpp 2008-07-17 18:30:20 UTC (rev 3382)
+++ trunk/src/server/core/alarm.cpp 2008-07-17 18:52:48 UTC (rev 3383)
@@ -1,6 +1,6 @@
 /*
 ** NetXMS - Network Management System
-** Copyright (C) 2003, 2004, 2005, 2006, 2007 Victor Kirhenshtein
+** Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Victor Kirhenshtein
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -110,7 +110,8 @@
                                  "original_severity,current_severity,"
                                  "alarm_key,creation_time,last_change_time,"
                                  "hd_state,hd_ref,ack_by,repeat_count,"
- "alarm_state FROM alarms WHERE alarm_state<2");
+ "alarm_state,timeout,timeout_event "
+ "FROM alarms WHERE alarm_state<2");
    if (hResult == NULL)
       return FALSE;
 
@@ -118,6 +119,7 @@
    if (m_dwNumAlarms > 0)
    {
       m_pAlarmList = (NXC_ALARM *)malloc(sizeof(NXC_ALARM) * m_dwNumAlarms);
+ memset(m_pAlarmList, 0, sizeof(NXC_ALARM) * m_dwNumAlarms);
       for(i = 0; i < m_dwNumAlarms; i++)
       {
          m_pAlarmList[i].dwAlarmId = DBGetFieldULong(hResult, i, 0);
@@ -138,6 +140,8 @@
          m_pAlarmList[i].dwAckByUser = DBGetFieldULong(hResult, i, 12);
          m_pAlarmList[i].dwRepeatCount = DBGetFieldULong(hResult, i, 13);
          m_pAlarmList[i].nState = (BYTE)DBGetFieldLong(hResult, i, 14);
+ m_pAlarmList[i].dwTimeout = DBGetFieldULong(hResult, i, 15);
+ m_pAlarmList[i].dwTimeoutEvent = DBGetFieldULong(hResult, i, 16);
       }
    }
 
@@ -627,7 +631,7 @@
                                  (m_pAlarmList[i].nState == ALARM_STATE_OUTSTANDING) &&
                                  ((time_t)m_pAlarmList[i].dwLastChangeTime + (time_t)m_pAlarmList[i].dwTimeout > now))
                         {
- PostEvent(EVENT_ALARM_TIMEOUT, m_pAlarmList[i].dwSourceObject, "dssd",
+ PostEvent(m_pAlarmList[i].dwTimeoutEvent, m_pAlarmList[i].dwSourceObject, "dssd",
                                           m_pAlarmList[i].dwAlarmId, m_pAlarmList[i].szMessage,
                                                          m_pAlarmList[i].szKey, m_pAlarmList[i].dwSourceEventCode);
                                 m_pAlarmList[i].dwTimeout = 0; // Disable repeated timeout events

Modified: trunk/src/server/libnxsrv/agent.cpp
===================================================================
--- trunk/src/server/libnxsrv/agent.cpp 2008-07-17 18:30:20 UTC (rev 3382)
+++ trunk/src/server/libnxsrv/agent.cpp 2008-07-17 18:52:48 UTC (rev 3383)
@@ -30,7 +30,8 @@
 // Constants
 //
 
-#define RECEIVER_BUFFER_SIZE 262144
+//#define RECEIVER_BUFFER_SIZE 262144
+#define RECEIVER_BUFFER_SIZE 4194304
 
 
 //

Modified: trunk/src/server/tools/nxdbmgr/upgrade.cpp
===================================================================
--- trunk/src/server/tools/nxdbmgr/upgrade.cpp 2008-07-17 18:30:20 UTC (rev 3382)
+++ trunk/src/server/tools/nxdbmgr/upgrade.cpp 2008-07-17 18:52:48 UTC (rev 3383)
@@ -103,6 +103,25 @@
 
 
 //
+// Upgrade from V82 to V83
+//
+
+static BOOL H_UpgradeFromV82(void)
+{
+ // Fix incorrect alarm timeouts
+ if (!SQLQuery(_T("UPDATE alarms SET timeout=0,timeout_event=43")))
+ if (!g_bIgnoreErrors)
+ return FALSE;
+
+ if (!SQLQuery(_T("UPDATE config SET var_value='83' WHERE var_name='DBFormatVersion'")))
+ if (!g_bIgnoreErrors)
+ return FALSE;
+
+ return TRUE;
+}
+
+
+//
 // Upgrade from V81 to V82
 //
 
@@ -3648,6 +3667,7 @@
    { 79, H_UpgradeFromV79 },
    { 80, H_UpgradeFromV80 },
    { 81, H_UpgradeFromV81 },
+ { 82, H_UpgradeFromV82 },
    { 0, NULL }
 };
 
Received on Thu Jul 17 2008 - 21:52:48 EEST