Skip to content

U
uniset2
Commit 6bc465e0 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(LogReader): немного увеличил timeout при исполнении команды

Выпуск новой версии (2.1-alt6)
parent ae278e5f
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
conf/libuniset2.spec
View file @ 6bc465e0
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.1 Version: 2.1
Release: alt5 Release: alt6
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
...@@ -455,6 +455,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname ...@@ -455,6 +455,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# .. # ..
%changelog %changelog
* Thu Jun 04 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt6
- (smonit): print supplier, change print format
- (admin): add getChangedTime function
* Tue Jun 02 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt5 * Tue Jun 02 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt5
- (LogServer): refactoring - (LogServer): refactoring
......
src/Log/LogReader.cc
View file @ 6bc465e0
...@@ -202,7 +202,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std: ...@@ -202,7 +202,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std:
// после команд.. выводим список текущий.. // после команд.. выводим список текущий..
timeout_t reply_timeout = 1000; // TIMEOUT_INF; timeout_t reply_timeout = 2000; // TIMEOUT_INF;
LogServerTypes::lsMessage msg; LogServerTypes::lsMessage msg;
msg.cmd = LogServerTypes::cmdList; msg.cmd = LogServerTypes::cmdList;
...@@ -213,7 +213,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std: ...@@ -213,7 +213,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std:
// теперь ждём ответ.. // теперь ждём ответ..
try try
{ {
int a = 1; int a = 2;
while( a > 0 && tcp->isPending(ost::Socket::pendingInput, reply_timeout) ) while( a > 0 && tcp->isPending(ost::Socket::pendingInput, reply_timeout) )
{ {
......
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