commit 1f5870a5d02b7e8b9ca317fe0737107660ef1b77
author Brian Norris <briannorris@chromium.org> Fri Jun 03 18:18:10 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Jun 08 04:35:22 2016 -0700
tree 7214bbe8cbb8dfc956ab9c25620bdcb54b4dc9e5
parent 8a0bd70dffa81b4e9b334ca188b186cf0cab9d74

upstart: factor out is_running() helper

This is useful on its own.

BUG=chromium:616778
TEST=none

Change-Id: I9a3fab34a1929e33422cce7e24e1b28fcc45708f
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/349677
Reviewed-by: Dan Erat <derat@chromium.org>

client/cros/upstart.py

diff --git a/client/cros/upstart.py b/client/cros/upstart.py
index c40f964..2acf763 100644
--- a/client/cros/upstart.py
+++ b/client/cros/upstart.py
@@ -25,6 +25,14 @@
     return os.path.exists('/etc/init/' + service_name + '.conf')
 
 
+def is_running(service_name):
+    """
+    Returns true if |service_name| is running.
+
+    @param service_name: name of service
+    """
+    return utils.system_output('status %s' % service_name).find('start/running') != -1
+
 def restart_job(service_name):
     """
     Restarts an upstart job if it's running.
@@ -33,7 +41,7 @@
     @param service_name: name of service
     """
 
-    if utils.system_output('status %s' % service_name).find('start/running') != -1:
+    if is_running(service_name):
         utils.system_output('restart %s' % service_name)
     else:
         utils.system_output('start %s' % service_name)