Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
6bc465e0
Commit
6bc465e0
authored
Jun 04, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(LogReader): немного увеличил timeout при исполнении команды
Выпуск новой версии (2.1-alt6)
parent
ae278e5f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
libuniset2.spec
conf/libuniset2.spec
+5
-1
LogReader.cc
src/Log/LogReader.cc
+2
-2
No files found.
conf/libuniset2.spec
View file @
6bc465e0
...
...
@@ -13,7 +13,7 @@
Name: libuniset2
Version: 2.1
Release: alt
5
Release: alt
6
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -455,6 +455,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
%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
- (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:
// после команд.. выводим список текущий..
timeout_t
reply_timeout
=
1
000
;
// TIMEOUT_INF;
timeout_t
reply_timeout
=
2
000
;
// TIMEOUT_INF;
LogServerTypes
::
lsMessage
msg
;
msg
.
cmd
=
LogServerTypes
::
cmdList
;
...
...
@@ -213,7 +213,7 @@ void LogReader::sendCommand( const std::string& _addr, ost::tpport_t _port, std:
// теперь ждём ответ..
try
{
int
a
=
1
;
int
a
=
2
;
while
(
a
>
0
&&
tcp
->
isPending
(
ost
::
Socket
::
pendingInput
,
reply_timeout
)
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment