Skip to content

Commit

Permalink
Upgrade to Cerise Client 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
LourensVeen committed Feb 10, 2019
1 parent d486412 commit 238585a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 6 additions & 7 deletions cerise_manager/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import time

import docker
import cerise_client.service as ccs
from cerise_client import Service

from cerise_manager import errors

Expand Down Expand Up @@ -234,7 +234,7 @@ def service_from_dict(srv_dict):
return get_service(srv_dict['name'])


class ManagedService(ccs.Service):
class ManagedService(Service):
"""A managed service in a Docker container.
"""
def __init__(self, name, port):
Expand Down Expand Up @@ -307,11 +307,10 @@ def get_log(self):
container = dc.containers.get(self._name)
stream, stat = container.get_archive('/var/log/cerise/cerise_backend.log')
with tempfile.TemporaryFile() as tmp:
tmp.write(stream.read())
for chunk in stream:
tmp.write(chunk)
tmp.seek(0)
with tarfile.open(fileobj=tmp) as archive:
# Scope guard does not work in Python 2
logfile = archive.extractfile('cerise_backend.log')
service_log = logfile.read().decode('utf-8')
logfile.close()
with archive.extractfile('cerise_backend.log') as logfile:
service_log = logfile.read().decode('utf-8')
return service_log
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
test_suite='tests',
install_requires=[
'cerise_client',
'cerise_client>=0.3.0',
'defusedxml==0.5.0',
'docker<4',
'future',
Expand Down

0 comments on commit 238585a

Please sign in to comment.