Revert "Started migration to AMQP."

This reverts commit ed74c35.

Author: grindars

bin/smartguard

@@ -1,87 +1,85 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-
 require 'smartguard'
 require 'trollop'
 require 'colored'
 
 def start_application(application, opts, &block)
 
-  EventMachine.run do
-    Smartguard::Logging.logger.info "Starting application"
+  Smartguard::Logging.logger.info "Starting application"
 
-    unless opts[:pid].nil?
-      begin
-        File.open(opts[:pid], "w") do |io|
-          io.write Process.pid.to_s
-        end
-      rescue => e
-        Smartguard::Logging.logger.error "Unable to write pidfile: #{e}"
+  unless opts[:pid].nil?
+    begin
+      File.open(opts[:pid], "w") do |io|
+        io.write Process.pid.to_s
       end
+    rescue => e
+      Smartguard::Logging.logger.error "Unable to write pidfile: #{e}"
     end
+  end
 
-    application = application.new opts[:path], opts[:broker]
+  application = application.new opts[:path]
 
-    signal_handler = ->(signal) do
-      begin
-        if Smartguard.shutting_down
-          Smartguard::Logging.logger.info "Okay, okay."
-        else
-          Smartguard::Logging.logger.info "Catched signal #{signal}, shutting down"
+  signal_handler = ->(signal) do
+    begin
+      if Smartguard.shutting_down
+        Smartguard::Logging.logger.info "Okay, okay."
+      else
+        Smartguard::Logging.logger.info "Catched signal #{signal}, shutting down"
+
+        Smartguard.shutting_down = true
+        Smartguard::Logging.logger.info "Stopping services"
+        application.stop_services
+      end
 
-          Smartguard.shutting_down = true
-          Smartguard::Logging.logger.info "Stopping services"
-          application.stop_services
-        end
+    rescue => e
+      Smartguard::Logging.logger.error "Shutdown failed: #{e}"
 
-      rescue => e
-        Smartguard::Logging.logger.error "Shutdown failed: #{e}"
+    ensure
+      exit 1
+    end
+  end
 
-      ensure
-        exit 1
-      end
+  trap :HUP, signal_handler
+  trap :INT, signal_handler
+  trap :QUIT, signal_handler
+  trap :PIPE, "IGNORE"
+  trap :TERM, signal_handler
+  Smartguard::ProcessManager.init
+
+  at_exit do
+    begin
+      Smartguard::Logging.logger.info "Killing any remaining processes"
+    ensure
+      Process.kill :KILL, 0
     end
+  end
 
-    trap :HUP, signal_handler
-    trap :INT, signal_handler
-    trap :QUIT, signal_handler
-    trap :PIPE, "IGNORE"
-    trap :TERM, signal_handler
-    Smartguard::ProcessManager.init
-
-    at_exit do
-      begin
-        Smartguard::Logging.logger.info "Killing any remaining processes"
-      ensure
-        Process.kill :KILL, 0
-      end
+  Smartguard::Logging.logger.info "Starting services"
+
+  begin
+    application.start_services do
+      Smartguard::Logging.logger.error "Startup failed, cleaning up and exiting"
+      application.stop_services
+      exit 1
+    end
+  rescue => e
+    Smartguard::Logging.logger.error "Exception catched during service startup: #{e}"
+    e.backtrace.each do |line|
+      Smartguard::Logging.logger.error line
     end
 
-    EventMachine.defer do
-      Smartguard::Logging.logger.info "Starting services"
+    exit 1
+  end
 
-      begin
-        application.start do
-          Smartguard::Logging.logger.error "Startup failed, cleaning up and exiting"
-          application.stop
-          exit 1
-        end
-      rescue => e
-        Smartguard::Logging.logger.error "Exception catched during service startup: #{e}"
-        e.backtrace.each do |line|
-          Smartguard::Logging.logger.error line
-        end
+  Smartguard::Logging.logger.info "Services started"
 
-        exit 1
-      end
+  DRb.start_service("druby://localhost:#{opts[:port]}", application)
+  Smartguard::Logging.logger.info "Smartguard ready"
 
-      Smartguard::Logging.logger.info "Services started"
-      Smartguard::Logging.logger.info "Smartguard ready"
+  yield if block_given?
 
-      yield if block_given?
-    end
-  end
+  DRb.thread.join
 end
 
 trap :TTIN do
@@ -100,7 +98,7 @@ opts = Trollop.options do
 
   opt :app, "Application to use", type: String
   opt :path, "Path to application", type: String
-  opt :broker, "AMQP broker", default: "amqp://guest:[email protected]:5672"
+  opt :port, "Port to run DRB", default: 10000
   opt :pid, "Pid file name", type: String
   opt :log, "Log file name", type: String
   opt :development, "Run in the development environment"

bin/smartguardctl

@@ -1,68 +1,60 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-
 require "trollop"
-require "eventmachine"
-require "json"
-require "amqp"
+require "smartguard"
 
 module CommandHandler
-  def self.cmd_start
-    [ [ "start" ], nil ]
+  def self.cmd_start(drb)
+    status = drb.start_services
   end
 
-  def self.cmd_stop
-    [ [ "stop" ], nil ]
+  def self.cmd_stop(drb)
+    drb.stop_services
   end
 
-  def self.cmd_restart
-    [ [ "restart" ], nil ]
+  def self.cmd_restart(drb)
+    drb.restart
   end
 
-  def self.cmd_status
-    done = ->(status) do
-      status.each do |service, (pid, active)|
-        printf "%-16s: ", service
+  def self.cmd_status(drb)
+    status = drb.status
+
+    status.each do |service, (pid, active)|
+      printf "%-16s: ", service
 
-        if active
-          puts "running, pid #{pid}"
-        else
-          puts "stopped"
-        end
+      if active
+        puts "running, pid #{pid}"
+      else
+        puts "stopped"
       end
     end
-
-    [ [ "status" ], done ]
   end
 
-  def self.cmd_switch_release
+  def self.cmd_switch_release(drb)
     if ARGV.empty?
       warn "release must be specified"
       exit 1
     end
 
     release = ARGV.shift
-
-    done = ->(success) do
-      if success
-        puts "releases switched"
-      else
-        warn "switch failed"
-        exit 1
-      end
+    status = drb.switch_release release
+    if status
+      puts "releases switched"
+    else
+      warn "switch failed"
+      exit 1
     end
-
-    [ [ "switch_release", release ], done ]
   end
 end
 
 opts = Trollop.options do
-  version "Smartguard CLI"
-  opt :broker, "AMQP broker", default: "amqp://guest:[email protected]:5672"
+  version "Smartguard CLI #{Smartguard::VERSION}"
+  opt :port, "DRB Port", default: 10000
   stop_on_unknown
 end
 
+drb = DRb::DRbObject.new_with_uri "druby://localhost:#{opts[:port]}"
+
 if ARGV.empty?
   warn "command must be specified"
   exit 1
@@ -75,51 +67,4 @@ unless CommandHandler.respond_to? cmd
   exit 1
 end
 
-EventMachine.run do
-  amqp_connection = AMQP.connect opts[:broker]
-  amqp_channel    = AMQP::Channel.new amqp_connection
-  guard_commands  = amqp_channel.fanout "smartguard.commands", auto_delete: true
-  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 = Process.pid
-
-  timer = EventMachine.add_timer(1) do
-    warn "Smartguard is not responding"
-
-    exit 1
-  end
-
-  status_queue.subscribe do |header, message|
-    body = JSON.load(message)
-
-    case header.routing_key
-    when "command.started"
-      id, = body
-      if id == id
-        warn "Executing command"
-        EventMachine.cancel_timer timer
-      end
-
-    when "command.finished"
-      id, result, error = body
-      if id == id
-        if !error.nil?
-          warn "Command failed: #{error}"
-        elsif !complete.nil?
-          complete.call result
-        end
-
-        exit 0
-      end
-    end
-  end
-
-  guard_commands.publish JSON.dump({
-    id: id,
-    command: cmd
-  })
-end
+CommandHandler.send cmd, drb

lib/smartguard.rb

@@ -1,10 +1,8 @@
 require 'active_support/all'
 require 'pathname'
 require 'fileutils'
+require 'drb'
 require 'socket'
-require 'eventmachine'
-require 'amqp'
-require 'json'
 
 require 'smartkiosk/common'
 

lib/smartguard/application.rb

@@ -1,9 +1,8 @@
 module Smartguard
   class Application
     attr_reader :releases_path, :current_path, :shared_path, :active_path
-    attr_reader :amqp_connection, :amqp_channel, :guard_commands, :guard_status
 
-    def initialize(path, broker)
+    def initialize(path)
       @base_path = Pathname.new(File.absolute_path path)
 
       if Smartguard.environment == :production
@@ -17,47 +16,6 @@ def initialize(path, broker)
         @shared_path   = @base_path
         @active_path   = @base_path
       end
-
-      @amqp_connection = AMQP.connect broker
-      @amqp_channel    = AMQP::Channel.new @amqp_connection
-      @guard_commands  = @amqp_channel.fanout "smartguard.commands", auto_delete: true
-      @guard_status    = @amqp_channel.topic "smartguard.events", auto_delete: true
-
-      command_queue = @amqp_channel.queue '', exclusive: true
-      command_queue.bind @guard_commands
-      command_queue.subscribe &method(:command)
-    end
-
-    def post_event(event, *args)
-      EventMachine.schedule do
-        @guard_status.publish JSON.dump(args), routing_key: event
-      end
-    end
-
-    private
-
-    def command(header, data)
-      data = JSON.load data
-
-      operation = ->() do
-        post_event 'command.started', data["id"]
-
-        begin
-          dispatch_command *data["command"]
-        rescue => e
-          e
-        end
-      end
-
-      callback = ->(result) do
-        if result.respond_to? :exception
-          post_event 'command.finished', data["id"], nil, result.to_s
-        else
-          post_event 'command.finished', data["id"], result
-        end
-      end
-
-      EventMachine.defer operation, callback
     end
   end
 end