Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
zoe
main
Commits
6d1da377
Commit
6d1da377
authored
Sep 20, 2017
by
Daniele Venzano
🏇
Browse files
Merge branch 'devel/fixes' into 'master'
Make the Zoe master more resistant to Swarm being offline See merge request
!22
parents
d627bb1f
a91f2235
Pipeline
#4547
passed with stages
in 4 minutes and 46 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
zoe_master/backends/swarm/api_client.py
View file @
6d1da377
...
...
@@ -104,7 +104,10 @@ class SwarmClient:
manager
=
url
else
:
raise
ZoeException
(
'Unsupported URL scheme for Swarm'
)
self
.
cli
=
docker
.
DockerClient
(
base_url
=
manager
,
version
=
"auto"
,
tls
=
tls
)
try
:
self
.
cli
=
docker
.
DockerClient
(
base_url
=
manager
,
version
=
"auto"
,
tls
=
tls
)
except
docker
.
errors
.
DockerException
:
raise
ZoeException
(
"Cannot connect to Docker"
)
def
info
(
self
)
->
ClusterStats
:
"""Retrieve Swarm statistics. The Docker API returns a mess difficult to parse."""
...
...
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