auser-poolparty 0.2.38 → 0.2.39

data/lib/poolparty/monitors/base_monitor.rb

@@ -11,11 +11,11 @@ module PoolParty
     
     module InstanceMethods
       def expand_when(*arr)
-        @expand_when ||= ((arr && arr.empty?) ? options[:expand_when] : configure(:expand_when => self.class.send(:rules, :expand_when, arr)))
+        @expand_when ||= ((arr && arr.empty?) ? options[:expand_when] : configure(:expand_when => self.class.send(:rules,:expand_when,arr,false)))
       end
       
       def contract_when(*arr)
-        @contract_when ||= ((arr && arr.empty?) ? options[:contract_when] : configure(:contract_when => self.class.send(:rules, :contract_when, arr)))
+        @contract_when ||= ((arr&&arr.empty?) ? options[:contract_when] : configure(:contract_when => self.class.send(:rules,:contract_when,arr,false)))
       end
     end
     
@@ -23,7 +23,7 @@ module PoolParty
       args.each do |arg|
         (available_monitors << "#{arg}".downcase.to_sym)
         
-        InstanceMethods.module_eval "def #{arg}; PoolParty::Messenger.messenger_send!(\"get_load #{arg}\"); end"
+        InstanceMethods.module_eval "def #{arg}; PoolParty::Messenger.messenger_send!(\"get_load #{arg}\").to_f rescue -1; end"
       end
     end
 

data/lib/poolparty/monitors/monitors/cpu_monitor.rb

@@ -5,7 +5,7 @@ module PoolParty
       
       def run
         str = %x[uptime]
-        str.split(/\s+/)[-2].to_f rescue 0.0
+        str.split(/\s+/)[-1].to_f rescue 0.0
       end
             
     end

data/lib/poolparty/net/messenger.rb

@@ -16,7 +16,7 @@ module PoolParty
     end
     
     def self.messenger_send!(cmd="", testing=false)
-      command = Messenger.erl_command("client", "-s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
+      command = Messenger.erl_command("client#{Time.now.to_i}", "-s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
       testing ? command : %x[#{command}]
     end
     

data/lib/poolparty/net/remote_instance.rb

@@ -72,7 +72,7 @@ module PoolParty
         ". /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1"
       end
       def self.puppet_master_rerun_command
-        "/usr/bin/puppetcleaner; #{puppet_runner_command}"
+        "#{puppet_runner_command}"
       end
       def self.puppet_rerun_commad
         "/usr/bin/puppetrerun 2>&1 > /dev/null"

data/lib/poolparty/net/remoter.rb

@@ -152,6 +152,7 @@ module PoolParty
       # Then wait for the master to launch
       def launch_and_configure_master!(testing=false)
         vputs "Requesting to launch new instance"
+        logger.debug "Launching master"
         request_launch_new_instances(1) if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
         
         vputs "Waiting for there to be no pending instances..."
@@ -183,6 +184,7 @@ module PoolParty
       # get go
       def expand_cloud_if_necessary(force=false)
         if can_start_a_new_instance? && should_expand_cloud?(force)
+          logger.debug "Expanding the cloud based on load"
           @num = 1
           @out = request_launch_new_instances(@num)
           
@@ -204,9 +206,12 @@ module PoolParty
       # If we can shutdown an instnace and the load allows us to contract
       # the cloud, then we should request_termination_of_non_master_instance
       def contract_cloud_if_necessary(force=false)
-        if can_shutdown_an_instance?
-          before_shutdown
-          request_termination_of_non_master_instance if should_contract_cloud?(force)
+        if can_shutdown_an_instance?          
+          if should_contract_cloud?(force)
+            logger.debug "Shrinking the cloud by 1"
+            before_shutdown
+            request_termination_of_non_master_instance
+          end
         end
       end
       

data/lib/poolparty/pool/base.rb

@@ -78,8 +78,16 @@ module PoolParty
         end.first || ::File.join( "/tmp/poolparty")
       end
       
+      def logger_location
+        [
+            "/var/logs/poolparty"
+        ].select do |dir|
+          dir if ::File.directory?(dir) && ::File.readable?(dir)
+        end.first || ::File.join(Dir.pwd, "logs")
+      end
+      
       def pool_logger_location
-        File.join(Dir.pwd, "logs")
+        ::File.join(logger_location, "pool.logs")
       end
       
       # Array of allowed_commands that you can run on the remote nodes

data/lib/poolparty/templates/puppetcleaner

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+# /var/lib/puppet/state/puppetdlock
 . /etc/profile
 ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
 /etc/init.d/puppetmaster stop

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 38
+    TINY  = 39
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.38
+  version: 0.2.39
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-01 00:00:00 -07:00
+date: 2008-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,7 +139,6 @@ files:
 - bin/server-start-node
 - config/hoe.rb
 - config/requirements.rb
-- erl_crash.dump
 - examples/basic.rb
 - examples/plugin_without_plugin_directory.rb
 - examples/poolparty.rb
@@ -147,6 +146,36 @@ files:
 - generators/poolspec/USAGE
 - generators/poolspec/poolspec_generator.rb
 - generators/poolspec/templates/pool_spec_template.erb
+- lib/erlang/cloudpanel/Makefile
+- lib/erlang/cloudpanel/doc/cloudpanel.html
+- lib/erlang/cloudpanel/doc/cloudpanel_app.html
+- lib/erlang/cloudpanel/doc/cloudpanel_deps.html
+- lib/erlang/cloudpanel/doc/cloudpanel_sup.html
+- lib/erlang/cloudpanel/doc/cloudpanel_web.html
+- lib/erlang/cloudpanel/ebin/cloudpanel.app
+- lib/erlang/cloudpanel/ebin/cloudpanel.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_app.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_deps.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_sup.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_web.beam
+- lib/erlang/cloudpanel/priv/www/images/bg_content.gif
+- lib/erlang/cloudpanel/priv/www/index.html
+- lib/erlang/cloudpanel/priv/www/javascripts/jquery.js
+- lib/erlang/cloudpanel/priv/www/stylesheets/application.css
+- lib/erlang/cloudpanel/priv/www/stylesheets/classes.css
+- lib/erlang/cloudpanel/priv/www/stylesheets/colors.css
+- lib/erlang/cloudpanel/priv/www/stylesheets/nav.css
+- lib/erlang/cloudpanel/src/Makefile
+- lib/erlang/cloudpanel/src/cloudpanel.app
+- lib/erlang/cloudpanel/src/cloudpanel.erl
+- lib/erlang/cloudpanel/src/cloudpanel.hrl
+- lib/erlang/cloudpanel/src/cloudpanel_app.erl
+- lib/erlang/cloudpanel/src/cloudpanel_deps.erl
+- lib/erlang/cloudpanel/src/cloudpanel_sup.erl
+- lib/erlang/cloudpanel/src/cloudpanel_web.erl
+- lib/erlang/cloudpanel/start-dev.sh
+- lib/erlang/cloudpanel/start.sh
+- lib/erlang/cloudpanel/support/include.mk
 - lib/erlang/messenger/Emakefile
 - lib/erlang/messenger/Makefile
 - lib/erlang/messenger/README

data/spec/poolparty/monitors/base_monitor_spec.rb

@@ -25,6 +25,10 @@ describe "Monitors" do
     PoolParty::Messenger.should_receive(:messenger_send!).with("get_load fake").and_return true
     TestMonitorClass.new.fake
   end
+  it "should have the cpu method on the class" do
+    PoolParty::Messenger.should_receive(:messenger_send!).with("get_load cpu").and_return true
+    TestMonitorClass.new.cpu
+  end
   describe "expansions" do
     before(:each) do
       @tmc = TestMonitorClass.new
@@ -81,6 +85,10 @@ describe "Monitors" do
       end
     end
     describe "when neither is over the limits" do
+      before(:each) do
+        @tmc.stub!(:cpu).and_return 87
+        @tmc.stub!(:memory).and_return 40
+      end
       it "should not expand" do
         @tmc.valid_rules?(:expand_when).should == false
       end

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.38</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.39</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.38
+  version: 0.2.39
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-01 00:00:00 -07:00
+date: 2008-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,7 +139,6 @@ files:
 - bin/server-start-node
 - config/hoe.rb
 - config/requirements.rb
-- erl_crash.dump
 - examples/basic.rb
 - examples/plugin_without_plugin_directory.rb
 - examples/poolparty.rb
@@ -147,6 +146,36 @@ files:
 - generators/poolspec/USAGE
 - generators/poolspec/poolspec_generator.rb
 - generators/poolspec/templates/pool_spec_template.erb
+- lib/erlang/cloudpanel/Makefile
+- lib/erlang/cloudpanel/doc/cloudpanel.html
+- lib/erlang/cloudpanel/doc/cloudpanel_app.html
+- lib/erlang/cloudpanel/doc/cloudpanel_deps.html
+- lib/erlang/cloudpanel/doc/cloudpanel_sup.html
+- lib/erlang/cloudpanel/doc/cloudpanel_web.html
+- lib/erlang/cloudpanel/ebin/cloudpanel.app
+- lib/erlang/cloudpanel/ebin/cloudpanel.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_app.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_deps.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_sup.beam
+- lib/erlang/cloudpanel/ebin/cloudpanel_web.beam
+- lib/erlang/cloudpanel/priv/www/images/bg_content.gif
+- lib/erlang/cloudpanel/priv/www/index.html
+- lib/erlang/cloudpanel/priv/www/javascripts/jquery.js
+- lib/erlang/cloudpanel/priv/www/stylesheets/application.css
+- lib/erlang/cloudpanel/priv/www/stylesheets/classes.css
+- lib/erlang/cloudpanel/priv/www/stylesheets/colors.css
+- lib/erlang/cloudpanel/priv/www/stylesheets/nav.css
+- lib/erlang/cloudpanel/src/Makefile
+- lib/erlang/cloudpanel/src/cloudpanel.app
+- lib/erlang/cloudpanel/src/cloudpanel.erl
+- lib/erlang/cloudpanel/src/cloudpanel.hrl
+- lib/erlang/cloudpanel/src/cloudpanel_app.erl
+- lib/erlang/cloudpanel/src/cloudpanel_deps.erl
+- lib/erlang/cloudpanel/src/cloudpanel_sup.erl
+- lib/erlang/cloudpanel/src/cloudpanel_web.erl
+- lib/erlang/cloudpanel/start-dev.sh
+- lib/erlang/cloudpanel/start.sh
+- lib/erlang/cloudpanel/support/include.mk
 - lib/erlang/messenger/Emakefile
 - lib/erlang/messenger/Makefile
 - lib/erlang/messenger/README