Merge lp:~billy-olsen/charm-helpers/specify-restart-behavior-on-change into lp:charm-helpers

[Billy Olsen]

[lp:~billy-olsen/charm-helpers/specify-restart-behavior-on-change]

294. By Billy Olsen on 2015-01-21

Switch order of start stop and restart

Unmerged revisions

294. By Billy Olsen on 2015-01-21

Switch order of start stop and restart

293. By Billy Olsen on 2015-01-21

[wolsen,r=]

Adds the ability to control how the service restarts work. Allow
the charm developer to specify to restart, stop then start, reload,
etc and to do it selectively for the different services in the map.

Those services which are a list of strings will default to previous
behavior.

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2015-01-21 11:30:54 +0000
+++ charmhelpers/core/host.py	2015-01-21 19:29:44 +0000
@@ -279,14 +279,16 @@
     This function is used a decorator, for example::
 
         @restart_on_change({
-            '/etc/ceph/ceph.conf': [ 'cinder-api', 'cinder-volume' ]
+            '/etc/ceph/ceph.conf': [ 'cinder-api', 'cinder-volume',
+                                     {'haproxy': 'reload'} ]
             })
         def ceph_client_changed():
             pass  # your code here
 
     In this example, the cinder-api and cinder-volume services
     would be restarted if /etc/ceph/ceph.conf is changed by the
-    ceph_client_changed function.
+    ceph_client_changed function. The haproxy service will be
+    reloaded if the /etc/ceph/ceph.conf file is changed.
     """
     def wrap(f):
         def wrapped_f(*args):
@@ -299,12 +301,25 @@
                 if checksums[path] != file_hash(path):
                     restarts += restart_map[path]
             services_list = list(OrderedDict.fromkeys(restarts))
-            if not stopstart:
-                for service_name in services_list:
-                    service('restart', service_name)
-            else:
-                for action in ['stop', 'start']:
-                    for service_name in services_list:
+
+            # Allow custom service reload mechanism to be specified
+            # in the service definition.
+            action_map = OrderedDict()
+            for s in services_list:
+                if isinstance(s, dict):
+                    action_map.update(s)
+                elif not stopstart:
+                    action_map[s] = ['restart']
+                else:
+                    action_map[s] = ['stop', 'start']
+
+            for service_name, actions in six.iteritems(action_map):
+                for action in actions:
+                    # special case for reload so that if the service is
+                    # currently stopped, it will reload the service.
+                    if action == 'reload':
+                        service_reload(service_name)
+                    else:
                         service(action, service_name)
         return wrapped_f
     return wrap