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
Xavier Thompson
slapos.toolbox
Commits
6cb9d5c5
Commit
6cb9d5c5
authored
Jun 20, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[monitor]: monitor bootstrap doesn't fail if we can't connect to monitor URL
parent
eba2c149
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
slapos/monitor/monitor.py
slapos/monitor/monitor.py
+4
-4
No files found.
slapos/monitor/monitor.py
View file @
6cb9d5c5
...
@@ -215,10 +215,10 @@ class Monitoring(object):
...
@@ -215,10 +215,10 @@ class Monitoring(object):
response
=
urllib2
.
urlopen
(
url
,
context
=
context
,
timeout
=
timeout
)
response
=
urllib2
.
urlopen
(
url
,
context
=
context
,
timeout
=
timeout
)
else
:
else
:
response
=
urllib2
.
urlopen
(
url
,
timeout
=
timeout
)
response
=
urllib2
.
urlopen
(
url
,
timeout
=
timeout
)
except
urllib2
.
HTTPError
:
except
socket
.
timeout
:
print
"ERROR:
Failed to get Monitor configuration file
at %s "
%
url
print
"ERROR:
Timeout while downloading monitor config
at %s "
%
url
except
(
socket
.
timeout
,
ssl
.
SSLError
)
as
e
:
except
Exception
as
e
:
print
"ERROR:
Timeout with %r while downloading monitor config at %s "
%
(
e
,
url
)
print
"ERROR:
Failed to get Monitor configuration file at %s (%s)"
%
(
url
,
e
)
else
:
else
:
try
:
try
:
monitor_dict
=
json
.
loads
(
response
.
read
())
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