Fixed controller instances actor_id

Crystal-SDS · Oct 11, 2017 · c46564e · c46564e
1 parent 71e55f8
commit c46564e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/api/api/startup.py b/api/api/startup.py
@@ -26,6 +26,6 @@ def run():
     for key in r.keys('policy:*'):
         r.hset(key, 'alive', 'False')
 
-    # Controllers
-    for key in r.keys('controller:*'):
-        r.hset(key, 'enabled', 'False')
+    # Controller Instances
+    for key in r.keys('controller_instance:*'):
+        r.hset(key, 'status', 'Stopped')
diff --git a/api/controllers/urls.py b/api/controllers/urls.py
@@ -3,16 +3,15 @@
 
 urlpatterns = [
 
-    # Global Controllers
+    # Controllers
     url(r'^$', views.controller_list),
     url(r'^data/?$', views.ControllerData.as_view()),
     url(r'^(?P<controller_id>\w+)/data/?$', views.ControllerData.as_view()),
     url(r'^(?P<controller_id>\d+)/?$', views.controller_detail),
-
+
+    # Controller Instances
     url(r'^instances/?$', views.instences_list),
     url(r'^instance/?$', views.create_instance),
     url(r'^instance/(?P<instance_id>\w+)/?$', views.instance_detail),
 
-
-
 ]
diff --git a/api/controllers/views.py b/api/controllers/views.py
@@ -267,9 +267,11 @@ def start_controller_instance(instance_id, controller_name, controller_class_nam
         # params[param_name] = value
         params.append(value)
 
+    actor_id = controller_name+':'+instance_id
+
     try:
         if instance_id not in controller_actors:
-            controller_actors[instance_id] = host.spawn(controller_name, controller_location, params)
+            controller_actors[instance_id] = host.spawn(actor_id, controller_location, params)
             controller_actors[instance_id].run()
             logger.info("Controller, Started controller actor: "+controller_location)
     except Exception as e: