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
07d1c5cd
Commit
07d1c5cd
authored
Feb 11, 2019
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(TSDB): reopen connection for error "broken pipe"
parent
1df41e4b
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
5 deletions
+26
-5
libuniset2.spec
conf/libuniset2.spec
+4
-1
BackendOpenTSDB.cc
extensions/Backend-OpenTSDB/BackendOpenTSDB.cc
+8
-1
UObject_SK.h
extensions/include/UObject_SK.h
+1
-1
UObject_SK.cc
extensions/lib/UObject_SK.cc
+4
-2
LogReader.cc
src/Log/LogReader.cc
+9
-0
No files found.
conf/libuniset2.spec
View file @
07d1c5cd
...
...
@@ -24,7 +24,7 @@
Name: libuniset2
Version: 2.8
Release: alt
5
Release: alt
6
Summary: UniSet - library for building distributed industrial control systems
License: LGPL
...
...
@@ -544,6 +544,9 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
# history of current unpublished changes
%changelog
* Mon Feb 11 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt6
- (TSDB): reopen connection for error "broken pipe"
* Sat Feb 09 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt5
- (uniset-codegen): setup logrotate command
...
...
extensions/Backend-OpenTSDB/BackendOpenTSDB.cc
View file @
07d1c5cd
...
...
@@ -365,9 +365,16 @@ bool BackendOpenTSDB::flushBuffer()
return
true
;
}
catch
(
Poco
::
IOException
&
ex
)
{
mywarn
<<
"(flushBuffer): (io): "
<<
ex
.
displayText
()
<<
endl
;
lastError
=
ex
.
displayText
();
if
(
!
reconnect
()
)
askTimer
(
tmReconnect
,
reconnectTime
);
}
catch
(
std
::
exception
&
ex
)
{
mywarn
<<
"(flushBuffer): "
<<
ex
.
what
()
<<
endl
;
mywarn
<<
"(flushBuffer):
(std):
"
<<
ex
.
what
()
<<
endl
;
lastError
=
ex
.
what
();
}
...
...
extensions/include/UObject_SK.h
View file @
07d1c5cd
...
...
@@ -8,7 +8,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2019-02-0
2
+03:00
// generate timestamp: 2019-02-0
9
+03:00
// -----------------------------------------------------------------------------
#ifndef UObject_SK_H_
#define UObject_SK_H_
...
...
extensions/lib/UObject_SK.cc
View file @
07d1c5cd
...
...
@@ -11,7 +11,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2019-02-0
2
+03:00
// generate timestamp: 2019-02-0
9
+03:00
// -----------------------------------------------------------------------------
#include <memory>
#include <iomanip>
...
...
@@ -491,7 +491,9 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
string
fname
(
log
()
->
getLogFile
()
);
if
(
!
fname
.
empty
()
)
{
mylog
->
logFile
(
fname
.
c_str
(),
true
);
mylog
->
logFile
(
fname
.
c_str
(),
false
);
mylogany
<<
myname
<<
"(preSysCommand): ***************** mylog LOG ROTATE *****************"
<<
endl
;
}
...
...
src/Log/LogReader.cc
View file @
07d1c5cd
...
...
@@ -430,6 +430,11 @@ void LogReader::readlogs( const std::string& _addr, int _port, LogServerTypes::C
{
cerr
<<
"(LogReader): "
<<
e
.
displayText
()
<<
" ("
<<
_addr
<<
")"
<<
endl
;
}
catch
(
Poco
::
IOException
&
ex
)
{
cerr
<<
"(LogReader): "
<<
e
.
displayText
()
<<
" ("
<<
_addr
<<
")"
<<
endl
;
disconnect
();
}
catch
(
const
std
::
exception
&
ex
)
{
cerr
<<
"(LogReader): "
<<
ex
.
what
()
<<
endl
;
...
...
@@ -470,6 +475,10 @@ void LogReader::sendCommand(LogServerTypes::lsMessage& msg, bool verbose )
{
cerr
<<
"(LogReader): send error: "
<<
e
.
displayText
()
<<
endl
;
// " (" << _addr << ")" << endl;
}
catch
(
Poco
::
IOException
&
ex
)
{
cerr
<<
"(LogReader): send error: "
<<
ex
.
displayText
()
<<
endl
;
}
catch
(
const
std
::
exception
&
ex
)
{
cerr
<<
"(LogReader): send error: "
<<
ex
.
what
()
<<
endl
;
...
...
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