Skip to content

U
uniset2
Commit 688381ff authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

minor release

parent 913777a6
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
Utilities/codegen/ctl-cpp-common.xsl
View file @ 688381ff
...@@ -1275,9 +1275,9 @@ end_private(false) ...@@ -1275,9 +1275,9 @@ end_private(false)
if( smTestID == DefaultObjectId ) if( smTestID == DefaultObjectId )
smTestID = getSMTestID(); 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); ptStartUpTimeout.setTiming(msec);
// ===================== <variables> ===================== // ===================== <variables> =====================
...@@ -1751,7 +1751,7 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000)) ...@@ -1751,7 +1751,7 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 90000); 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); ptStartUpTimeout.setTiming(msec);
} }
......
conf/libuniset2.spec
View file @ 688381ff
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.6 Version: 2.6
Release: alt22 Release: alt23
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: LGPL License: LGPL
...@@ -508,6 +508,10 @@ rm -f %buildroot%_libdir/*.la ...@@ -508,6 +508,10 @@ rm -f %buildroot%_libdir/*.la
# history of current unpublished changes # history of current unpublished changes
%changelog %changelog
* 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 * Mon May 29 2017 Pavel Vainerman <pv@altlinux.ru> 2.6-alt22
- set default sm-ready-timeout to 120000 msec (2 min) - set default sm-ready-timeout to 120000 msec (2 min)
- changed raise(SIGTERM) --> std::terminate() - changed raise(SIGTERM) --> std::terminate()
......
extensions/lib/UObject_SK.cc
View file @ 688381ff
...@@ -196,9 +196,9 @@ end_private(false) ...@@ -196,9 +196,9 @@ end_private(false)
if( smTestID == DefaultObjectId ) if( smTestID == DefaultObjectId )
smTestID = getSMTestID(); 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); ptStartUpTimeout.setTiming(msec);
// ===================== <variables> ===================== // ===================== <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