Merge lp:~townsend/libertine/track-running-apps into lp:libertine

[Christopher Townsend]

Add a new entry to ContainersConfig for keeping track of running processes in a container.

I have put a 'pid' field that is not used in this MP. However, I will add code to use it once the refactor-app-wrapper MP is merged.

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

PASSED: Continuous integration, rev:313
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/163/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/317
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/317
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/317
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/317
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/317
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/317
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/304/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/401
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/383
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/383
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/383
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/382
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/382/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/382
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/382/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/382
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/382/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/382
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/382/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/382
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/382/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/382
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/382/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'python/libertine/ContainersConfig.py'
--- python/libertine/ContainersConfig.py	2016-10-11 19:54:52 +0000
+++ python/libertine/ContainersConfig.py	2016-10-13 15:05:19 +0000
@@ -326,6 +326,17 @@
                                                         package_name)
 
     """
+    Operations for running apps in a Libertine container.
+    """
+    def add_running_app(self, container_id, app_exec_name, pid=0):
+        app_obj = {'appExecName': app_exec_name, 'pid': pid}
+        self._set_value_by_key(container_id, 'runningApps', app_obj)
+
+    def delete_running_app(self, container_id, app_exec_name):
+        self._delete_array_object_by_key_value(container_id, 'runningApps',
+                                               'appExecName', app_exec_name)
+
+    """
     Fetcher functions for various configuration information.
     """
     def get_container_distro(self, container_id):

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-10-06 16:23:48 +0000
+++ python/libertine/Libertine.py	2016-10-13 15:05:19 +0000
@@ -655,24 +655,39 @@
     :param app_exec_line: The exec line used to start the app in the container.
     """
     def __init__(self, container_id, app_exec_line):
-        signal.signal(signal.SIGTERM, self.cleanup_lsb)
-        signal.signal(signal.SIGINT,  self.cleanup_lsb)
+        signal.signal(signal.SIGTERM, self.cleanup)
+        signal.signal(signal.SIGINT,  self.cleanup)
 
         self.container_id  = container_id
         self.app_exec_line = app_exec_line
         self.lsb           = None
         self.pasted        = None
 
-    def cleanup_lsb(self, signum, frame):
-        self.close_lsb()
-
-    def close_lsb(self):
+    def cleanup(self, signum, frame):
+        self.cleanup_helpers()
+
+    def cleanup_helpers(self):
+        self._remove_running_app()
+        self._close_lsb()
+        self._close_pasted()
+
+    def _close_lsb(self):
         if self.lsb is not None:
             self.lsb_process.terminate()
 
         while active_children():
             time.sleep(1)
 
+    def _close_pasted(self):
+        if self.pasted is not None:
+            self.pasted.terminate()
+
+    def _add_running_app(self):
+        ContainersConfig().add_running_app(self.container_id, self.app_exec_line[0])
+
+    def _remove_running_app(self):
+        ContainersConfig().delete_running_app(self.container_id, self.app_exec_line[0])
+
     """
     Launches the libertine session bridge. This creates a proxy socket to read to and from
     for abstract sockets such as dbus.
@@ -699,12 +714,11 @@
             raise RuntimeError("Container ID %s does not exist." % self.container_id)
 
         container = LibertineContainer(self.container_id)
+        self._add_running_app()
+
         try:
             container.launch_application(self.app_exec_line)
         except:
             raise
         finally:
-            self.close_lsb()
-
-            if self.pasted is not None:
-                self.pasted.terminate()
+            self.cleanup_helpers()