Увеличил умолчательные значения sm-ready-timeout

1eb1c8b3 · Pavel Vainerman · 55043bf2 · 1eb1c8b3 · 1eb1c8b3
Commit 1eb1c8b3 authored Dec 11, 2015 by Pavel Vainerman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

IOControl.cc extensions/IOControl/IOControl.cc +1 -1

SharedMemory.cc extensions/SharedMemory/SharedMemory.cc +1 -1

No files found.
--- a/extensions/IOControl/IOControl.cc
+++ b/extensions/IOControl/IOControl.cc
@@ -224,7 +224,7 @@ IOControl::IOControl(UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	int sm_tout = conf->getArgInt("--" + prefix + "-sm-ready-timeout", it.getProp("ready_timeout"));

 	if( sm_tout == 0 )
-		smReadyTimeout = 15000;
+		smReadyTimeout = 30000;
 	else if( sm_tout < 0 )
 		smReadyTimeout = UniSetTimer::WaitUpTime;
 	else

--- a/extensions/SharedMemory/SharedMemory.cc
+++ b/extensions/SharedMemory/SharedMemory.cc
@@ -140,7 +140,7 @@ SharedMemory::SharedMemory( ObjectId id, const std::string& datafile, const std:

 	evntPause = conf->getArgPInt("--e-startup-pause", 5000);

-	activateTimeout = conf->getArgPInt("--activate-timeout", 10000);
+	activateTimeout = conf->getArgPInt("--activate-timeout", 30000);

 	sidPulsar = DefaultObjectId;
 	string p = conf->getArgParam("--pulsar-id", it.getProp("pulsar_id"));