Revert "Changed routing scheme."

This reverts commit b8e0961.

Author: grindars

bin/smartguard

@@ -32,7 +32,7 @@ def start_application(application, opts, &block)
 
           Smartguard.shutting_down = true
           Smartguard::Logging.logger.info "Stopping services"
-          application.stop
+          application.stop_services
         end
 
       rescue => e

bin/smartguardctl

@@ -82,11 +82,10 @@ EventMachine.run do
   guard_status    = amqp_channel.topic "smartguard.events", auto_delete: true
 
   status_queue    = amqp_channel.queue '', exclusive: true
+  status_queue.bind guard_status, routing_key: 'command.*'
 
   cmd, complete = CommandHandler.send(cmd)
-  id = "ctl-#{Process.pid}"
-
-  status_queue.bind guard_status, routing_key: "command.#{id}.*"
+  id = Process.pid
 
   timer = EventMachine.add_timer(1) do
     warn "Smartguard is not responding"
@@ -97,15 +96,17 @@ EventMachine.run do
   status_queue.subscribe do |header, message|
     body = JSON.load(message)
 
-    prefix, msg_id, event = header.routing_key.split(".")
-    if msg_id == id
-      case event
-      when "started"
+    case header.routing_key
+    when "command.started"
+      id, = body
+      if id == id
         warn "Executing command"
         EventMachine.cancel_timer timer
+      end
 
-      when "finished"
-        result, error = body
+    when "command.finished"
+      id, result, error = body
+      if id == id
         if !error.nil?
           warn "Command failed: #{error}"
         elsif !complete.nil?

lib/smartguard/application.rb

@@ -40,7 +40,7 @@ def command(header, data)
       data = JSON.load data
 
       operation = ->() do
-        post_event "command.#{data["id"]}.started"
+        post_event 'command.started', data["id"]
 
         begin
           dispatch_command *data["command"]
@@ -51,9 +51,9 @@ def command(header, data)
 
       callback = ->(result) do
         if result.respond_to? :exception
-          post_event "command.#{data["id"]}.finished", nil, result.to_s
+          post_event 'command.finished', data["id"], nil, result.to_s
         else
-          post_event "command.#{data["id"]}.finished", result
+          post_event 'command.finished', data["id"], result
         end
       end