Merge lp:~townsend/libertine/fix-missing-log into lp:libertine

[Christopher Townsend]

Check if the LXC container is defined before trying to start it.
Catch any errors when trying to open the LXC log on container start failure.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:261
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/33/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/126
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/88
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/88
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/88
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/88
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/88
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/88
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/103/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/129
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/114
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/114
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/114
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/107
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/107/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/107
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/107/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/107
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/107/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/107
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/107/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/107
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/107/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/107
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/107/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/33/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-06-28 20:16:55 +0000
+++ python/libertine/LxcContainer.py	2016-06-29 12:57:00 +0000
@@ -18,6 +18,7 @@
 import psutil
 import shlex
 import subprocess
+import sys
 import tempfile
 
 from .Libertine import BaseContainer
@@ -100,6 +101,9 @@
             return True
 
     def start_container(self):
+        if not self.container.defined:
+            raise RuntimeError("Container %s is not valid" % self.container_id)
+
         if not self.container.running:
             self._set_lxc_log()
             if not self.container.start():
@@ -305,6 +309,9 @@
         self.container.append_config_item("lxc.logpriority", "3")
 
     def _dump_lxc_log(self):
-        with open(self.lxc_log_file, 'r') as fd:
-            for line in fd:
-                print(line.lstrip())
+        try:
+            with open(self.lxc_log_file, 'r') as fd:
+                for line in fd:
+                    print(line.lstrip())
+        except Exception as ex:
+            print("Could not open LXC log file: %s" % ex, file=sys.stderr)