Skip to content
Snippets Groups Projects
Commit c73b726a authored by Samuel GAIST's avatar Samuel GAIST
Browse files

[dock] Code cleanup

parent b04a3cdd
No related branches found
No related tags found
1 merge request!62Code cleanup
...@@ -49,7 +49,7 @@ import socket ...@@ -49,7 +49,7 @@ import socket
import tempfile import tempfile
import time import time
import docker import docker
import subprocess as sp import subprocess as sp # nosec
import logging import logging
from beat.core import stats from beat.core import stats
...@@ -140,14 +140,14 @@ class Host(object): ...@@ -140,14 +140,14 @@ class Host(object):
self.processing_environments.keys(), self.processing_environments.keys(),
) )
)[0] )[0]
except: except IndexError:
try: try:
return list( return list(
filter( filter(
lambda x: x.startswith(name + " ("), self.db_environments.keys() lambda x: x.startswith(name + " ("), self.db_environments.keys()
) )
)[0] )[0]
except: except IndexError:
return None return None
@property @property
...@@ -245,10 +245,10 @@ class Host(object): ...@@ -245,10 +245,10 @@ class Host(object):
replacement = True replacement = True
else: else:
keep = True keep = True
except: except Exception:
replacement = True replacement = True
except: except Exception:
keep = True keep = True
elif new_version is not None: elif new_version is not None:
...@@ -493,7 +493,7 @@ class Host(object): ...@@ -493,7 +493,7 @@ class Host(object):
try: try:
return simplejson.loads(stdout)[0]["State"]["Status"] return simplejson.loads(stdout)[0]["State"]["Status"]
except: except Exception:
return None return None
def logs(self, container): def logs(self, container):
...@@ -569,7 +569,7 @@ class Host(object): ...@@ -569,7 +569,7 @@ class Host(object):
status = self.wait(container) status = self.wait(container)
output = self.logs(container) output = self.logs(container)
except Exception as e: except Exception:
return 1, None return 1, None
finally: finally:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment