1
=== modified file 'python/libertine/LxcContainer.py'
2
--- python/libertine/LxcContainer.py	2016-06-28 20:16:55 +0000
3
+++ python/libertine/LxcContainer.py	2016-06-29 12:57:00 +0000
4
@@ -18,6 +18,7 @@
5
18
import psutil
18
import psutil
6
19
import shlex
19
import shlex
7
20
import subprocess
20
import subprocess
8
21
import sys
9
21
import tempfile
22
import tempfile
10
22
23
11
23
from .Libertine import BaseContainer
24
from .Libertine import BaseContainer
12
@@ -100,6 +101,9 @@
13
100
            return True
101
            return True
14
101
102
15
102
    def start_container(self):
103
    def start_container(self):
16
104
        if not self.container.defined:
17
105
            raise RuntimeError("Container %s is not valid" % self.container_id)
18
106
19
103
        if not self.container.running:
107
        if not self.container.running:
20
104
            self._set_lxc_log()
108
            self._set_lxc_log()
21
105
            if not self.container.start():
109
            if not self.container.start():
22
@@ -305,6 +309,9 @@
23
305
        self.container.append_config_item("lxc.logpriority", "3")
309
        self.container.append_config_item("lxc.logpriority", "3")
24
306
310
25
307
    def _dump_lxc_log(self):
311
    def _dump_lxc_log(self):
29
308
        with open(self.lxc_log_file, 'r') as fd:
312
        try:
30
309
            for line in fd:
313
            with open(self.lxc_log_file, 'r') as fd:
31
310
                print(line.lstrip())
314
                for line in fd:
32
315
                    print(line.lstrip())
33
316
        except Exception as ex:
34
317
            print("Could not open LXC log file: %s" % ex, file=sys.stderr)
Reviewer	Review Type	Date Requested	Status
Larry Price		2016-06-29	Approve on 2016-06-29
Libertine CI Bot	continuous-integration		Approve on 2016-06-29
Review via email: mp+298633@code.launchpad.net