feat(controller): restart individual processes

Author: Matthew Fisher

client/deis.py

@@ -1747,12 +1747,14 @@ def ps_restart(self, args):
         Arguments:
           <type>
             the process name as defined in your Procfile, such as 'web' or 'worker'.
+            To restart a particular process, use 'web.1'.
 
         Options:
           -a --app=<app>
             the uniquely identifiable name for the application.
         """
         app = args.get('--app')
+        procname = args.get('<type>')
         if not app:
             app = self._session.app
         restarting_cmd = 'Restarting processes... but first, {}!\n'.format(
@@ -1764,9 +1766,15 @@ def ps_restart(self, args):
             progress.start()
             before = time.time()
             url = '/v1/apps/{}/containers/restart'.format(app)
-            if args.get('<type>'):
-                url = '/v1/apps/{}/containers/{}/restart'.format(app,
-                                                                 args.get('<type>'))
+            if procname:
+                if '.' in procname:
+                    # format is web.2
+                    proctype, procnum = procname.split('.')
+                    url = '/v1/apps/{}/containers/{}/{}/restart'.format(app,
+                                                                        proctype,
+                                                                        procnum)
+                else:
+                    url = '/v1/apps/{}/containers/{}/restart'.format(app, procname)
             response = self._dispatch('post', url)
         finally:
             progress.cancel()

controller/api/models.py

@@ -201,7 +201,9 @@ def delete(self, *args, **kwargs):
     def restart(self, **kwargs):
         to_restart = self.container_set.all()
         if kwargs.get('type'):
-            to_restart = self.container_set.filter(type=kwargs.get('type'))
+            to_restart = to_restart.filter(type=kwargs.get('type'))
+        if kwargs.get('num'):
+            to_restart = to_restart.filter(num=kwargs.get('num'))
         self._restart_containers(to_restart)
         return to_restart
 

controller/api/urls.py

@@ -30,6 +30,9 @@
         views.ContainerViewSet.as_view({'post': 'restart'})),
     url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w.]+)/restart/?'.format(settings.APP_URL_REGEX),
         views.ContainerViewSet.as_view({'post': 'restart'})),
+    url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w]+)/(?P<num>[-_\w]+)/restart/?'.format(
+        settings.APP_URL_REGEX),
+        views.ContainerViewSet.as_view({'post': 'restart'})),
     url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w]+)/(?P<num>[-_\w]+)/?'.format(
         settings.APP_URL_REGEX),
         views.ContainerViewSet.as_view({'get': 'retrieve'})),