run_rabbit_run 0.0.8 → 0.1.0

data/lib/run_rabbit_run/config.rb

@@ -10,6 +10,7 @@ module RunRabbitRun
       @options = {
         application_path: application_path,
         pid:              "#{application_path}/tmp/pids/run_rabbit_run.pid",
+        guid:             "#{application_path}/tmp/pids/run_rabbit_run.guid",
         environment:      (ENV['RAKE_ENV'] || ENV['RAILS_ENV'] || 'development'),
         log:              "log/run_rabbit_run.log",
         rubbitmq:         {}
@@ -35,6 +36,10 @@ module RunRabbitRun
       options[:pid] = File.expand_path(value)
     end
 
+    def guid value
+      options[:guid] = File.expand_path(value)
+    end
+
     def worker name, path, options = {}, &block
       worker = RunRabbitRun::Config::Worker.new(path, options)
       worker.instance_exec &block if block_given?

data/lib/run_rabbit_run/guid.rb

@@ -0,0 +1,43 @@
+module RunRabbitRun
+  module Guid
+    extend self
+
+    def remove
+      File.delete(path) if File.exists?(path)
+    end
+
+    def guid
+      @guid || _guid 
+    end
+
+  private
+
+    def save(guid)
+      create_directory_if_not_exists(File.dirname(path))
+
+      File.open(path, "w") {|file| file.puts(guid) }
+    end
+
+    def _guid
+      @guid = File.open(path, 'r') { |file| file.read }.strip if File.exists?(path)
+      unless @guid
+        @guid = SecureRandom.uuid
+        save(@guid)
+      end
+
+      @guid
+    end 
+
+    def path
+      raise "[ERROR] please specify the guid file path" unless RunRabbitRun.config[:guid]
+
+      RunRabbitRun.config[:guid]
+    end
+
+    def create_directory_if_not_exists(dir)
+      FileUtils.mkdir_p(dir) unless File.exists?(dir)
+    end
+
+  end
+end
+

data/lib/run_rabbit_run/master.rb

@@ -2,6 +2,7 @@ require 'run_rabbit_run/workers'
 require 'run_rabbit_run/rabbitmq'
 require 'run_rabbit_run/rabbitmq/system_messages'
 require 'run_rabbit_run/pid'
+require 'run_rabbit_run/guid'
 require 'run_rabbit_run/processes/master'
 
 module RunRabbitRun
@@ -63,10 +64,10 @@ module RunRabbitRun
 
     def add_worker name
       EventMachine.run do
-        rabbitmq = RunRabbitRun::Rabbitmq::Base.new
 
+        rabbitmq = RunRabbitRun::Rabbitmq::Base.new
         system_messages = RunRabbitRun::Rabbitmq::SystemMessages.new(rabbitmq)
-        system_messages.publish(:system, :master, :add_worker, { worker: name })
+        system_messages.publish(:system, "master.#{RunRabbitRun::Guid.guid}", :add_worker, { worker: name })
 
         EventMachine.add_timer(2) do
           rabbitmq.stop
@@ -90,6 +91,7 @@ module RunRabbitRun
     def stop
       RunRabbitRun::Processes::Signals.stop_signal(:master, master_process.pid)
       Pid.remove
+      Guid.remove
     end
 
     def reload

data/lib/run_rabbit_run/processes/master.rb

@@ -1,4 +1,5 @@
 require 'run_rabbit_run/processes/base'
+require 'securerandom'
 
 module RunRabbitRun
 
@@ -16,7 +17,7 @@ module RunRabbitRun
           rabbitmq = RunRabbitRun::Rabbitmq::Base.new
           system_messages = RunRabbitRun::Rabbitmq::SystemMessages.new(rabbitmq)
 
-          system_messages.subscribe "master.#" do | headers, payload |
+          system_messages.subscribe "master.#{RunRabbitRun::Guid.guid}.#" do | headers, payload |
             call_callback :on_system_message_received, payload["from"].to_sym, payload["message"].to_sym, payload["data"]
           end
 

data/lib/run_rabbit_run/processes/worker.rb

@@ -4,9 +4,9 @@ module RunRabbitRun
   module Processes
     class Worker < Base
 
-      def initialize name, options
-        @options = options
-
+      def initialize name, master_guid, options
+        @options     = options
+        @master_guid = master_guid
         super name
       end
 
@@ -17,22 +17,22 @@ module RunRabbitRun
           rabbitmq = RunRabbitRun::Rabbitmq::Base.new
           system_messages = RunRabbitRun::Rabbitmq::SystemMessages.new(rabbitmq)
 
-          system_messages.publish(@name, :master, :process_started, { pid: Process.pid } )
+          system_messages.publish(@name, "master.#{@master_guid}", :process_started, { pid: Process.pid } )
 
           if @options[:processes] == 0
             add_timer 1 do
               rabbitmq.instance_eval File.read(@options[:path]), @options[:path]
 
-              system_messages.publish(@name, :master, :process_quit)
+              system_messages.publish(@name, "master.#{@master_guid}", :process_quit)
               rabbitmq.stop
             end
           else
 
             rabbitmq.on_message_received do | queue |
-              system_messages.publish(@name, :master, :message_received, { queue: queue.name } ) if @options[:log_to_master]
+              system_messages.publish(@name, "master.#{@master_guid}", :message_received, { queue: queue.name } ) if @options[:log_to_master]
             end
             rabbitmq.on_message_processed do | queue |
-              system_messages.publish(@name, :master, :message_processed, { queue: queue.name } ) if @options[:log_to_master]
+              system_messages.publish(@name, "master.#{@master_guid}", :message_processed, { queue: queue.name } ) if @options[:log_to_master]
             end
             rabbitmq.on_error do | queue, e |
               RunRabbitRun.logger.error "[#{@name}] #{e.message} \n#{e.backtrace.join("\n")}"
@@ -53,7 +53,7 @@ module RunRabbitRun
             end
 
             before_exit do
-              system_messages.publish(@name, :master, :process_quit)
+              system_messages.publish(@name, "master.#{@master_guid}", :process_quit)
               rabbitmq.stop
             end
           end

data/lib/run_rabbit_run/tasks.rb

@@ -43,15 +43,16 @@ namespace :rrr do
       RunRabbitRun::Master.remove_worker(args[:worker_name])
     end
 
-    task :new, [ :worker_name, :worker_guid ] => [ :config ] do | t, args |
+    task :new, [ :worker_name, :worker_guid, :master_guid ] => [ :config ] do | t, args |
       raise 'Please specify worker name' unless args[:worker_name]
       raise 'Please specify worker guid' unless args[:worker_guid]
+      raise 'Please specify worker guid' unless args[:master_guid]
 
       require 'run_rabbit_run/processes/worker'
 
       options = RunRabbitRun.config[:workers][args[:worker_name].to_sym]
 
-      RunRabbitRun::Processes::Worker.new(args[:worker_guid], options).start
+      RunRabbitRun::Processes::Worker.new(args[:worker_guid], args[:master_guid], options).start
     end
   end
 

data/lib/run_rabbit_run/version.rb

@@ -1,3 +1,3 @@
 module RunRabbitRun
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/run_rabbit_run/worker.rb

@@ -11,7 +11,7 @@ module RunRabbitRun
 
     def run
       #TODO get path for bundle
-      success = system("RAKE_ENV=#{RunRabbitRun.config[:environment]} bundle exec rake rrr:worker:new[#{@name},#{@guid}]")
+      success = system("RAKE_ENV=#{RunRabbitRun.config[:environment]} bundle exec rake rrr:worker:new[#{@name},#{@guid},#{RunRabbitRun::Guid.guid}]")
     end
 
     def kill

data/lib/run_rabbit_run/workers.rb

@@ -2,6 +2,7 @@ module RunRabbitRun
   require 'run_rabbit_run/worker'
 
   class Workers
+
     def initialize
       @workers = {}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_rabbit_run
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,7 @@ files:
 - lib/run_rabbit_run/callbacks.rb
 - lib/run_rabbit_run/config.rb
 - lib/run_rabbit_run/config/worker.rb
+- lib/run_rabbit_run/guid.rb
 - lib/run_rabbit_run/master.rb
 - lib/run_rabbit_run/pid.rb
 - lib/run_rabbit_run/processes/base.rb