Удалил старую функцию Extensions::getHeartBeatTime(). Перевёл всех

extensions/LogicProcessor/PassiveLProcessor.cc

@@ -28,7 +28,7 @@ PassiveLProcessor::PassiveLProcessor( std::string lfile, UniSetTypes::ObjectId o
             throw SystemError(err.str());
         }
 
-        int heartbeatTime = getHeartBeatTime();
+		int heartbeatTime = conf->getArgPInt("--" + prefix + "-heartbeat-time",conf->getHeartBeatTime());
         if( heartbeatTime )
             ptHeartBeat.setTiming(heartbeatTime);
         else

extensions/ModbusMaster/MBExchange.cc

@@ -96,7 +96,7 @@ pollActivated(false)
             throw SystemError(err.str());
         }
 
-        int heartbeatTime = getHeartBeatTime();
+        int heartbeatTime = conf->getArgPInt("--" + prefix + "-heartbeat-time",it.getProp("heartbeatTime"),conf->getHeartBeatTime());
         if( heartbeatTime )
             ptHeartBeat.setTiming(heartbeatTime);
         else

extensions/ModbusSlave/MBSlave.cc

@@ -175,7 +175,7 @@ prefix(prefix)
             throw SystemError(err.str());
         }
 
-        int heartbeatTime = getHeartBeatTime();
+        int heartbeatTime = conf->getArgPInt("--" + prefix + "-heartbeat-time",it.getProp("heartbeatTime"),conf->getHeartBeatTime());
         if( heartbeatTime )
             ptHeartBeat.setTiming(heartbeatTime);
         else
@@ -200,7 +200,7 @@ prefix(prefix)
     dinfo << myname << ": init askcount_id=" << askcount_id << endl;
     dinfo << myname << ": init test_id=" << test_id << endl;
 
-    wait_msec = getHeartBeatTime() - 100;
+    wait_msec = conf->getHeartBeatTime() - 100;
     if( wait_msec < 500 )
         wait_msec = 500;
 

extensions/UNetUDP/UNetExchange.cc

@@ -309,7 +309,7 @@ sender2(0)
             throw SystemError(err.str());
         }
 
-        int heartbeatTime = getHeartBeatTime();
+        int heartbeatTime = conf->getArgPInt("--" + prefix + "-heartbeat-time",it.getProp("heartbeatTime"),conf->getHeartBeatTime());
         if( heartbeatTime )
             ptHeartBeat.setTiming(heartbeatTime);
         else

src/Various/Configuration.cc

@@ -200,8 +200,6 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
             throw;
         }
 
-        // default value
-        heartbeat_msec = 5000;
 
 //    cerr << "*************** initConfiguration: xmlOpen: " << pt.getCurrent() << " msec " << endl;
 //    pt.reset();
@@ -245,20 +243,15 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
 
         initParameters();
 
-        // help
-//        if( !getArgParam("--help").empty() )
-//            help(cout);
 
         initRepSections();
 
         // localIOR
-//        localIOR = false; // ??. initParameters()
         int lior = getArgInt("--localIOR");
         if( lior )
             localIOR = lior;
 
         // transientIOR
-//        transientIOR = false; // ??. initParameters()
         int tior = getArgInt("--transientIOR");
         if( tior )
             transientIOR = tior;
@@ -511,10 +504,16 @@ void Configuration::initParameters()
             if( confDir.empty() )
                 confDir = getRootDir();
         }
-        else if( name == "HeartBeatTime" )
+	}
+
+	// Heartbeat init...
+	xmlNode* cnode = getNode("HeartBeatTime");
+	if( cnode )
         {
-            heartbeat_msec = it.getIntProp("name");
-        }
+		UniXML_iterator hit(cnode);
+		heartbeat_msec = hit.getIntProp("msec");
+		if( heartbeat_msec <= 0 )
+			heartbeat_msec = 5000;
     }
 }
 // -------------------------------------------------------------------------