haredo 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: adcb099319bb52f459a005ddd10a86995fef2093
-  data.tar.gz: 848ea0c89540ff8298f035bfcb9cd228a42c3fde
-SHA512:
-  metadata.gz: 19d58fc3a38f411b09b1d2c91f4678fc8b3cf6401ed0e6f16d0985891686cfc41e4f29daf9cee796ec791c6be19d637a273040f35efb80e3d73862ae3eb016ef
-  data.tar.gz: 2aeaf95425000d2a19fe15f5881e6b5cb2e6e26a7844104ea9f3e577e0c242d330e22d382feacfef3cace2ec1417b21c9f85c06e84d5e553e77474fc553cc077
+!binary "U0hBMQ==":
+  metadata.gz: 25ee3694c7e587feb59fd2dc3c7f465de5b39bd4
+  data.tar.gz: 612008a826cbcecd3aab6a79cadda24b5e9225c0
+!binary "U0hBNTEy":
+  metadata.gz: 5e8caf0ddeab879b29927252c7fde06868c9027263893d401a6d4edaaf818161ab418b095a89da110664a10cead03d2a77ca8d69005a42d5e06a5d5bdef9f3ee
+  data.tar.gz: 104ed2490ba2369605c54b03d78d6535b274efdafb63795565d5835ea7366084a717e11bbf2da01a29640448ef13daa3a562a353acc00b46746ff45810c92ba3

data/README.md

@@ -359,8 +359,8 @@ class Plugin < HareDo::Plugin
 
   UUID = 'echo'
 
-  def initialize(service, config)
-    super UUID, service, config 
+  def initialize(service, config, env)
+    super UUID, service, config, env
   end
 
   def process(msg)

data/src/lib/haredo/config.rb

@@ -1,6 +1,9 @@
 require 'yaml'
 require 'haredo/peer'
 
+HAREDO_DEFAULT_CONFIG_FILE = '/etc/haredo/haredo.conf'
+HAREDO_DEFAULT_PID_FILE    = '/var/run/haredo.pid'
+
 class Time
   def isoDate()
     return self.strftime("%Y-%m-%d %H:%M:%S")
@@ -11,10 +14,10 @@ module HareDo
 module Config
 
   def loadConfig(file=nil)
-    @config_file = file || '/etc/haredo/haredo.conf'
+    @config_file = file || $haredo_default_config_file || HAREDO_DEFAULT_CONFIG_FILE 
     @config      = []    
     @config      = YAML.load_file(@config_file)
-    @pid_file    = '/var/run/haredo.pid'
+    @pid_file    = $haredo_default_pid_file || HAREDO_DEFAULT_PID_FILE
   end
 
   def saveConfig()

data/src/lib/haredo/peer.rb

@@ -90,11 +90,13 @@ class Manager
 
   attr_reader :loaded
   attr_accessor :module_path_prefix
+  attr_accessor :environment
 
   def initialize(peer)
-    @peer    = peer
-    @loaded  = {}
-    @config  = {}
+    @peer        = peer
+    @loaded      = {}
+    @config      = {}
+    @environment = {}
 
     @module_path_prefix = 'haredo/plugins'
   end
@@ -119,7 +121,7 @@ class Manager
       if File.exists? path
         instance = Instance.new(path)
         cls = instance.get('Plugin')
-        plugin = cls.new(@peer, @config[cls::UUID])
+        plugin = cls.new(@peer, @config[cls::UUID], @environment)
         @loaded[plugin.uuid] = plugin
         $stderr.puts "Loaded plugin #{path}"
 
@@ -357,7 +359,7 @@ class Peer
       end
       
       sleep @sleep_interval
-    end    
+    end
   end
 
   # You should use this method to reply back to a peer. It sets the reply header
@@ -415,7 +417,9 @@ class Peer
     
     listen_queue.subscribe(:block => block, :ack => true) do |info, props, data|
       @channel.acknowledge(info.delivery_tag, false)
-      serve RabbitMQ::Message.new(info, props, data)
+      if serve(RabbitMQ::Message.new(info, props, data)) == false
+        exit 0
+      end
     end
   end
   

data/src/lib/haredo/plugin.rb

@@ -4,10 +4,11 @@ class Plugin
 
   attr_reader :uuid
 
-  def initialize(uuid, peer, config={})
+  def initialize(uuid, peer, config={}, environment={})
     @uuid   = uuid
     @peer   = peer
     @config = config
+    @env    = environment
   end
 
   def finalize()

data/src/lib/haredo/plugins/echo.rb

@@ -4,8 +4,8 @@ class Plugin < HareDo::Plugin
 
   UUID = 'echo'
 
-  def initialize(peer, config)
-    super UUID, peer, config 
+  def initialize(peer, config, env)
+    super UUID, peer, config, env 
   end
 
   def process(msg)

data/src/lib/haredo/plugins/status.rb

@@ -7,8 +7,8 @@ class Plugin < HareDo::Plugin
 
   attr_accessor :plugins
 
-  def initialize(service, config)
-    super UUID, service, config 
+  def initialize(service, config, env)
+    super UUID, service, config, env
 
     @plugins = {}
   end

data/src/lib/haredo/service/admin/daemon.rb

@@ -45,7 +45,9 @@ class Interface < Admin::Interface
     
     fork do
       Process.daemon()
-      exec('/usr/bin/haredo', '-d')
+
+      exe = $haredo_daemon_name  || HAREDO_DEFAULT_DAEMON_NAME
+      exec(exe, '-d')
     end
   end
 
@@ -54,7 +56,9 @@ class Interface < Admin::Interface
       client = connectBroker()      
       client.timeout = 3
 
-      response = client.call('haredo', :headers=>{'uuid'=>'status'})
+      queue_name = @config['system']['queue']
+
+      response = client.call(queue_name, :headers=>{'uuid'=>'status'})
       
       if response != nil
         puts response.data()
@@ -70,10 +74,11 @@ class Interface < Admin::Interface
     $stderr.puts "stop #{daemonPid()}"
       
     daemon_key = @config['daemon']['key']
-    
+    queue_name = @config['system']['queue']    
+
     client = connectBroker()
     
-    client.send( 'haredo', 
+    client.send( queue_name, 
                  :headers => { 
                    'command' => 'stop',
                    'key'     => daemon_key,

data/src/lib/haredo/service/config.rb

@@ -2,6 +2,8 @@ require 'yaml'
 
 require 'haredo/config'
 
+HAREDO_DEFAULT_DAEMON_NAME = '/usr/bin/haredo'
+
 module HareDo
 module Service
 

data/src/lib/haredo/service/daemon.rb

@@ -34,6 +34,7 @@ class Daemon < HareDo::Peer
     @queue_properties = {}
     @loaded_modules   = []
 
+    @config_file = config_file
     loadConfig(config_file)
 
     account = @config['system']['broker']
@@ -55,13 +56,13 @@ class Daemon < HareDo::Peer
     end
 
     # Use configuration file for queue name
-
     if daemon_conf.has_key?('queue')
       @queue_name = daemon_conf['queue']['name'] || 'haredo'
       @queue_properties = daemon_conf['queue']['properties'] || {}
     end
 
     # Change module search path
+    pluginStartup()
 
     plugin_conf = @config['daemon']['services'].each do |service_name, service_conf|
 
@@ -78,6 +79,16 @@ class Daemon < HareDo::Peer
     status_plugin = @plugins['status']
     status_plugin.plugins = @plugins.loaded
   end
+  
+  # Custom hook for plugin startup. Called before plugins are initialized.
+  def pluginStartup()
+    
+  end
+
+  # Custom hook for plugin shutdown. Called after plugins are shutdown.
+  def pluginShutdown()
+    
+  end
 
   # Defined the queue this service will listen on. Assumes a single-instance
   # service therefore declares queue as exclusive.
@@ -114,7 +125,7 @@ class Daemon < HareDo::Peer
     file.write(Process.pid.to_s)
     file.close()
 
-    listen(args)  
+    listen(args)
   end
 
   def serve(msg)
@@ -124,7 +135,7 @@ class Daemon < HareDo::Peer
       if msg.headers['key'] == @daemon_key
         Syslog.notice('Exiting')
         disconnect()
-        return
+        return false
       end
     end
 
@@ -133,6 +144,7 @@ class Daemon < HareDo::Peer
 
   def shutdown()
     @plugins.shutdown()
+    pluginShutdown()
   end
 
 end # class

data/src/lib/haredo/version.rb

@@ -4,8 +4,8 @@ module HareDo
 VERSION_MAJ  = '2'
 VERSION_MIN  = '0'
 VERSION_CL   = ''
-VERSION_PL   = '4'
-VERSION      = '2.0.4-1'
-RELEASE_DATE = 'Tue, 08 Oct 2013 14:41:57 -0500'
+VERSION_PL   = '5'
+VERSION      = '2.0.5-1'
+RELEASE_DATE = 'Sat, 12 Oct 2013 17:24:34 -0500'
 
 end # module HareDo

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: haredo
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: src/bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A P2P framework over RabbitMQ
@@ -38,7 +38,6 @@ files:
 - src/lib/haredo/peer.rb
 - src/lib/haredo/plugin.rb
 - src/lib/haredo/plugins/echo.rb
-- src/lib/haredo/plugins/example.rb
 - src/lib/haredo/plugins/status.rb
 - src/lib/haredo/service/admin/daemon.rb
 - src/lib/haredo/service/config.rb
@@ -56,17 +55,17 @@ require_paths:
 - src/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A simple client/server framework using RabbitMQ

data/src/lib/haredo/plugins/example.rb

@@ -1,17 +0,0 @@
-require 'json'
-require 'haredo/plugin'
-
-class Plugin < HareDo::Plugin
-
-  UUID = 'example'
-
-  def initialize(service, config)
-    super UUID, service, config 
-  end
-
-  def process(msg)
-    # Send back configuration
-    @peer.reply(msg, :data=>JSON::pretty_generate(@config))
-  end
-
-end # class Plugin