Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
data_importer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IA2
data_importer
Commits
993f4df1
Commit
993f4df1
authored
11 years ago
by
Marco De Marco
Browse files
Options
Downloads
Patches
Plain Diff
Reset connection fix
parent
95192305
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Client.cpp
+7
-1
7 additions, 1 deletion
src/Client.cpp
src/SSLClient.cpp
+2
-2
2 additions, 2 deletions
src/SSLClient.cpp
with
9 additions
and
3 deletions
src/Client.cpp
+
7
−
1
View file @
993f4df1
...
...
@@ -249,10 +249,12 @@ void Client::handleUpdateLists(const boost::system::error_code& errorCode)
else
if
(
errorCode
==
boost
::
asio
::
error
::
operation_aborted
)
{
DEBUG_STREAM
<<
"Client::handleUpdateLists() STOP"
<<
endl
;
//TODO: change state and status
}
else
{
ERROR_STREAM
<<
"Client::handle
Resolve
() "
<<
errorCode
.
message
()
<<
endl
;
ERROR_STREAM
<<
"Client::handle
UpdateLists
() "
<<
errorCode
.
message
()
<<
endl
;
writeState
(
Tango
::
ALARM
);
writeStatus
(
errorCode
.
message
());
...
...
@@ -549,10 +551,14 @@ void Client::resetConnection()
{
ERROR_STREAM
<<
"Client::resetConnection() Connection timeout"
<<
endl
;
m_resetConnectionTimer
.
expires_at
(
boost
::
posix_time
::
pos_infin
);
closeConnection
();
startUpdateLists
();
}
m_resetConnectionTimer
.
async_wait
(
boost
::
bind
(
&
Client
::
resetConnection
,
this
));
}
//==============================================================================
...
...
This diff is collapsed.
Click to expand it.
src/SSLClient.cpp
+
2
−
2
View file @
993f4df1
...
...
@@ -84,7 +84,7 @@ void SSLClient::startConnect(boost::asio::ip::tcp::resolver::iterator endPointIt
}
else
{
ERROR_STREAM
<<
"
Plain
Client::startConnect() No more endpoint"
<<
endl
;
ERROR_STREAM
<<
"
SSL
Client::startConnect() No more endpoint"
<<
endl
;
writeState
(
Tango
::
ALARM
);
writeStatus
(
"No more endpoint"
);
...
...
@@ -105,7 +105,7 @@ void SSLClient::handleConnect(const boost::system::error_code& errorCode,
}
else
{
ERROR_STREAM
<<
"
Plain
Client::handleConnect() "
<<
errorCode
.
message
()
<<
endl
;
ERROR_STREAM
<<
"
SSL
Client::handleConnect() "
<<
errorCode
.
message
()
<<
endl
;
writeState
(
Tango
::
ALARM
);
writeStatus
(
errorCode
.
message
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment