Skip to content

U
uniset2
Commit 393b8d69 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

minor release

parent 4c2c1f7d
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
Utilities/codegen/ctl-cpp-common.xsl
View file @ 393b8d69
......@@ -1275,9 +1275,9 @@ end_private(false)
if( smTestID == DefaultObjectId )
smTestID = getSMTestID();
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 90000);
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 120000);
int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 50000);
int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", conf->getStartupIgnoreTimeout());
ptStartUpTimeout.setTiming(msec);
// ===================== <variables> =====================
......@@ -1751,7 +1751,7 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 90000);
int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 60000);
int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", conf->getStartupIgnoreTimeout());
ptStartUpTimeout.setTiming(msec);
}
......
conf/libuniset2.spec
View file @ 393b8d69
......@@ -511,6 +511,10 @@ rm -f %buildroot%_libdir/*.la
* Tue Sep 12 2017 Alexei Takaseev <taf@altlinux.org> 2.6-alt19.1
- Rebuild with poco 1.7.9
# * Mon May 29 2017 Pavel Vainerman <pv@altlinux.ru> 2.6-alt23
# - (Configuration): add getStartapIgnoreTimeout()
# - minor fixes
# * Mon May 29 2017 Pavel Vainerman <pv@altlinux.ru> 2.6-alt22
# - set default sm-ready-timeout to 120000 msec (2 min)
# - changed raise(SIGTERM) --> std::terminate()
......
extensions/lib/UObject_SK.cc
View file @ 393b8d69
......@@ -196,9 +196,9 @@ end_private(false)
if( smTestID == DefaultObjectId )
smTestID = getSMTestID();
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 90000);
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 120000);
int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 50000);
int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", conf->getStartupIgnoreTimeout());
ptStartUpTimeout.setTiming(msec);
// ===================== <variables> =====================
......
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