Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Justin
slapos.toolbox
Commits
d5aaf706
Commit
d5aaf706
authored
Jun 05, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Jun 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: Catch timeout rise by ssl.SSLError
Additionally print exact exception message. /reviewed-on
!56
parent
76b353fa
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
slapos/monitor/monitor.py
slapos/monitor/monitor.py
+2
-2
No files found.
slapos/monitor/monitor.py
View file @
d5aaf706
...
...
@@ -217,8 +217,8 @@ class Monitoring(object):
response
=
urllib2
.
urlopen
(
url
,
timeout
=
timeout
)
except
urllib2
.
HTTPError
:
print
"ERROR: Failed to get Monitor configuration file at %s "
%
url
except
socket
.
timeout
,
e
:
print
"ERROR: Timeout w
hile downloading monitor config at %s "
%
url
except
(
socket
.
timeout
,
ssl
.
SSLError
)
as
e
:
print
"ERROR: Timeout w
ith %r while downloading monitor config at %s "
%
(
e
,
url
)
else
:
try
:
monitor_dict
=
json
.
loads
(
response
.
read
())
...
...
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