Skip to content

U
uniset2
Commit 13ced4c3 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

fix merge

parent 3fbc638a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 12 deletions
extensions/SharedMemory/SharedMemory.cc
View file @ 13ced4c3
...@@ -80,14 +80,9 @@ SharedMemory::SharedMemory( ObjectId id, string datafile ): ...@@ -80,14 +80,9 @@ SharedMemory::SharedMemory( ObjectId id, string datafile ):
e_filter = conf->getArgParam("--e-filter"); e_filter = conf->getArgParam("--e-filter");
buildEventList(cnode); buildEventList(cnode);
evntPause = conf->getArgInt("--e-startup-pause"); evntPause = conf->getArgPInt("--e-startup-pause", 5000);
if( evntPause <= 0 )
evntPause = 5000;
activateTimeout = conf->getArgInt("--activate-timeout");
if( activateTimeout <= 0 )
activateTimeout = 10000;
activateTimeout = conf->getArgPInt("--activate-timeout", 10000);
siPulsar.id = DefaultObjectId; siPulsar.id = DefaultObjectId;
siPulsar.node = DefaultObjectId; siPulsar.node = DefaultObjectId;
...@@ -104,9 +99,7 @@ SharedMemory::SharedMemory( ObjectId id, string datafile ): ...@@ -104,9 +99,7 @@ SharedMemory::SharedMemory( ObjectId id, string datafile ):
} }
siPulsar.node = conf->getLocalNode(); siPulsar.node = conf->getLocalNode();
msecPulsar = conf->getArgInt("--pulsar-msec",it.getProp("pulsar_msec")); msecPulsar = conf->getArgPInt("--pulsar-msec",it.getProp("pulsar_msec"), 5000);
if( msecPulsar <=0 )
msecPulsar = 5000;
} }
} }
...@@ -388,8 +381,8 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec ) ...@@ -388,8 +381,8 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec )
if( heartbeat_node != it.getProp("heartbeat_node") ) if( heartbeat_node != it.getProp("heartbeat_node") )
return true; return true;
int i = atoi(it.getProp("heartbeat").c_str()); int i = it.getIntProp("heartbeat");
if( i<=0 ) if( i <= 0 )
return true; return true;
if( it.getProp("iotype") != "AI" ) if( it.getProp("iotype") != "AI" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment