wildcloud-agent 0.0.1 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.2 (10.1.2012)
+
+* sudo for starting components
+
 ## 0.0.1 (9.1.2012)
 
 * going public

data/lib/wildcloud/agent.rb

@@ -25,10 +25,6 @@ require 'wildcloud/configuration'
 
 require 'singleton'
 
-require 'wildcloud/agent/load_monitor'
-require 'wildcloud/agent/component_manager'
-require 'wildcloud/agent/heartbeat'
-
 module Wildcloud
   module Agent
 
@@ -45,7 +41,7 @@ module Wildcloud
         EventMachine.error_handler(&method(:handle_error))
         start_amqp
         start_component_manager
-        start_load_monitor
+        start_load_monitor if self.config['loadmonitor'] && self.config['loadmonitor']['active']
         start_heartbeat
       end
 
@@ -71,15 +67,18 @@ module Wildcloud
       end
 
       def start_component_manager
+        require 'wildcloud/agent/component_manager'
         @component_manager = ComponentManager.new(self)
         @component_manager.auto_start
       end
 
       def start_load_monitor
+        require 'wildcloud/agent/load_monitor'
         @load_monitor = LoadMonitor.new(self)
       end
 
       def start_heartbeat
+        require 'wildcloud/agent/heartbeat'
         @heartbeat = Heartbeat.new(self)
       end
 

data/lib/wildcloud/agent/component_manager.rb

@@ -57,7 +57,6 @@ module Wildcloud
         stopped = proc do |out, status|
           @components.delete(component)
           @agent.logger.info('ComponentManager') { "Component #{component} stopped with status #{status.exitstatus}" }
-          #@agent.logger.info('ComponentManager') { "Output for #{component}\n#{out}" }
           if !@shutdown && @settings[component]['persistent']
             @agent.logger.info('ComponentManager') { "Component #{component} will be restarted" }
             EventMachine.add_timer(5) do
@@ -66,7 +65,14 @@ module Wildcloud
           end
         end
 
-        @settings[component][:pid] = EventMachine.system("wildcloud-#{component}", started, stopped)
+        command = "wildcloud-#{component}"
+
+        command = "cd #{message['directory']} && exec #{command}" if message['directory']
+
+        command = "su #{message['user']} -c 'source /etc/profile && #{command}'" if message['user']
+
+        @settings[component][:pid] = EventMachine.system(command, started, stopped)
+
       end
 
       def active_components
@@ -82,7 +88,15 @@ module Wildcloud
 
       def auto_start
         (@agent.config['autostart'] ||= []).each do |component|
-          handle_message('action' => 'start', 'persistent' => true, 'component' => component)
+          options = {'action' => 'start', 'persistent' => true}
+          if component.kind_of?(Hash)
+            options['component'] = component['component']
+            options['user'] = component['user']
+            options['directory'] = component['directory']
+          else
+            options['component'] = component.to_s
+          end
+          handle_message(options)
         end
       end
 

data/lib/wildcloud/agent/heartbeat.rb

@@ -22,14 +22,15 @@ module Wildcloud
         @interval = @agent.config['heartbeat']['interval']
         @agent.logger.info('Heartbeat', "Will be reporting every #{@interval} seconds")
         @timer = EventMachine.add_periodic_timer(@interval, &method(:heartbeat))
+        @load_monitor = @agent.config['loadmonitor'] && @agent.config['loadmonitor']['active']
       end
 
       def heartbeat
         message = {
             :components => @agent.component_manager.active_components,
-            :load => @agent.load_monitor.report,
             :topic => :heartbeat
         }
+        message[:load] = @agent.load_monitor.report if @load_monitor
         @agent.publish(message, :routing_key => 'heartbeat')
       end
 

data/lib/wildcloud/agent/version.rb

@@ -14,6 +14,6 @@
 
 module Wildcloud
   module Agent
-    VERSION = '0.0.1' unless const_defined?(:VERSION)
+    VERSION = '0.0.3' unless const_defined?(:VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildcloud-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
+date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &2152525440 !ruby/object:Gem::Requirement
+  requirement: &2152863220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152525440
+  version_requirements: *2152863220
 - !ruby/object:Gem::Dependency
   name: sigar
-  requirement: &2152523220 !ruby/object:Gem::Requirement
+  requirement: &2152860600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152523220
+  version_requirements: *2152860600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152522000 !ruby/object:Gem::Requirement
+  requirement: &2152859820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152522000
+  version_requirements: *2152859820
 - !ruby/object:Gem::Dependency
   name: wildcloud-logger
-  requirement: &2152521280 !ruby/object:Gem::Requirement
+  requirement: &2152859120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152521280
+  version_requirements: *2152859120
 - !ruby/object:Gem::Dependency
   name: wildcloud-configuration
-  requirement: &2152520560 !ruby/object:Gem::Requirement
+  requirement: &2152858480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,7 +65,7 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152520560
+  version_requirements: *2152858480
 description: Manages processes for the platform and provides monitoring
 email:
 - marek@jelen.biz