auser-poolparty 0.2.45 → 0.2.46

data/Manifest.txt

@@ -45,154 +45,11 @@ examples/with_apache_plugin.rb
 generators/poolspec/USAGE
 generators/poolspec/poolspec_generator.rb
 generators/poolspec/templates/pool_spec_template.erb
-lib/erlang/cloudpanel/EMakefile
-lib/erlang/cloudpanel/Makefile
-lib/erlang/cloudpanel/cloudpanel.rb
-lib/erlang/cloudpanel/deps/mochiweb/LICENSE
-lib/erlang/cloudpanel/deps/mochiweb/Makefile
-lib/erlang/cloudpanel/deps/mochiweb/README
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochifmt.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochifmt_records.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochifmt_std.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochihex.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochijson.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochijson2.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochinum.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_app.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_charref.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_cookies.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_echo.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_headers.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_html.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_http.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_multipart.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_request.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_response.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_skel.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_socket_server.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_sup.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/mochiweb_util.html
-lib/erlang/cloudpanel/deps/mochiweb/doc/reloader.html
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochifmt.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochifmt_records.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochifmt_std.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochihex.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochijson.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochijson2.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochinum.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb.app
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_app.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_charref.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_cookies.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_echo.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_headers.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_html.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_http.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_multipart.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_request.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_response.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_skel.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_socket_server.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_sup.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/mochiweb_util.beam
-lib/erlang/cloudpanel/deps/mochiweb/ebin/reloader.beam
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/Makefile
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/priv/www/index.html
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/Makefile
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel.app
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel.erl
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel.hrl
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_app.erl
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_deps.erl
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_sup.erl
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/src/skel_web.erl
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/start-dev.sh
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/start.sh
-lib/erlang/cloudpanel/deps/mochiweb/priv/skel/support/include.mk
-lib/erlang/cloudpanel/deps/mochiweb/scripts/new_mochiweb.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/Makefile
-lib/erlang/cloudpanel/deps/mochiweb/src/mochifmt.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochifmt_records.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochifmt_std.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochihex.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochijson.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochijson2.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochinum.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb.app
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_app.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_charref.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_cookies.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_echo.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_headers.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_html.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_http.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_multipart.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_request.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_response.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_skel.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_socket_server.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_sup.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/mochiweb_util.erl
-lib/erlang/cloudpanel/deps/mochiweb/src/reloader.erl
-lib/erlang/cloudpanel/deps/mochiweb/support/include.mk
-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/doc/string.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/ebin/string.beam
-lib/erlang/cloudpanel/ebin/tail_log.beam
-lib/erlang/cloudpanel/ebin/tailor.beam
-lib/erlang/cloudpanel/ebin/utils.beam
-lib/erlang/cloudpanel/ebin/views.beam
-lib/erlang/cloudpanel/ebin/web_utils.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/javascripts/site.js
-lib/erlang/cloudpanel/priv/www/pages/index.html
-lib/erlang/cloudpanel/priv/www/pages/tail.html
-lib/erlang/cloudpanel/priv/www/partials/error.html
-lib/erlang/cloudpanel/priv/www/partials/footer.html
-lib/erlang/cloudpanel/priv/www/partials/header.html
-lib/erlang/cloudpanel/priv/www/partials/menu.html
-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/src/string.erl
-lib/erlang/cloudpanel/src/tail_log.erl
-lib/erlang/cloudpanel/src/tailor.erl
-lib/erlang/cloudpanel/src/utils.erl
-lib/erlang/cloudpanel/src/views.erl
-lib/erlang/cloudpanel/start-dev.sh
-lib/erlang/cloudpanel/start.sh
-lib/erlang/cloudpanel/support/include.mk
-lib/erlang/cloudpanel/yaws.conf
 lib/erlang/messenger/Emakefile
 lib/erlang/messenger/Makefile
 lib/erlang/messenger/README
 lib/erlang/messenger/Rakefile
 lib/erlang/messenger/control
-lib/erlang/messenger/ebin/erl_crash.dump
 lib/erlang/messenger/ebin/master.app
 lib/erlang/messenger/ebin/master_app.beam
 lib/erlang/messenger/ebin/node.app
@@ -267,10 +124,8 @@ lib/erlang/messenger/lib/eunit/src/eunit_tty.erl
 lib/erlang/messenger/lib/eunit/src/file_monitor.erl
 lib/erlang/messenger/lib/eunit/sys.config
 lib/erlang/messenger/lib/eunit/vsn.mk
-lib/erlang/messenger/pm_master.beam
 lib/erlang/messenger/pm_master_rel-0.1.boot
 lib/erlang/messenger/pm_master_rel-0.1.script
-lib/erlang/messenger/pm_node.beam
 lib/erlang/messenger/pm_node_rel-0.1.boot
 lib/erlang/messenger/pm_node_rel-0.1.script
 lib/erlang/messenger/src/master_app.erl
@@ -341,6 +196,7 @@ lib/poolparty/modules/thread_pool.rb
 lib/poolparty/monitors/base_monitor.rb
 lib/poolparty/monitors/monitors/cpu_monitor.rb
 lib/poolparty/monitors/monitors/memory_monitor.rb
+lib/poolparty/monitors/monitors/web_monitor.rb
 lib/poolparty/net/messenger.rb
 lib/poolparty/net/remote.rb
 lib/poolparty/net/remote_bases/ec2.rb
@@ -420,6 +276,7 @@ spec/poolparty/modules/file_writer_spec.rb
 spec/poolparty/modules/s3_string_spec.rb
 spec/poolparty/monitors/base_monitor_spec.rb
 spec/poolparty/monitors/monitors/cpu_monitor_spec.rb
+spec/poolparty/monitors/monitors/memory_monitor_spec.rb
 spec/poolparty/net/messenger_spec.rb
 spec/poolparty/net/remote_bases/ec2_spec.rb
 spec/poolparty/net/remote_instance_spec.rb

data/Rakefile

@@ -5,7 +5,8 @@ Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 desc "Clean tmp directory"
 task :clean_tmp do |t|
-  %w(logs tmp ~).each do |dir|
+  %x[rm #{File.dirname(__FILE__)}/Manifest.txt; touch #{File.dirname(__FILE__)}/Manifest.txt]
+  %w(logs tmp).each do |dir|
     FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}")
   end
 end
@@ -15,6 +16,10 @@ task :clean_pkg do |t|
     FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}")
   end
 end
+
+desc "Generate a new manifest and a new gem"
+task :build_local_gem => [:clean_tmp, :spec, :clean_pkg, :"manifest:refresh", :package]
+
 desc "Generate gemspec"
 task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :local_deploy] do |t|
   res = %x[rake debug_gem]

data/bin/cloud

@@ -8,7 +8,8 @@ name = ARGV.select {|arg| arg if Binary.available_binaries_for("cloud").include?
 # original options back, but if they do contain a binary, we don't want -h getting through to 
 # these options, so we'll strip it if it's included
 DUP_ARG = ARGV.dup
-new_args = DUP_ARG.reject {|arg| Binary.available_binaries_for("cloud").include?(arg) }.empty? ? ARGV : (name ? (DUP_ARG.delete("-h"); DUP_ARG) : DUP_ARG)
+new_args = DUP_ARG.map {|arg| DUP_ARG.delete(arg) unless help_array.include?(arg) || Binary.available_binaries_for("cloud").include?(arg) }
+new_args = new_args.reject {|arg| Binary.available_binaries_for("cloud").include?(arg) }.empty? ? ARGV : (name ? (help_array.each {|arg| DUP_ARG.delete(arg)}; DUP_ARG) : DUP_ARG)
 
 # Let's make sure if no command is passed in that we show the help message
 new_args.push("-h") unless name

data/bin/pool

@@ -8,7 +8,8 @@ name = ARGV.select {|arg| arg if Binary.available_binaries_for("pool").include?(
 # original options back, but if they do contain a binary, we don't want -h getting through to 
 # these options, so we'll strip it if it's included
 DUP_ARG = ARGV.dup
-new_args = DUP_ARG.reject {|arg| Binary.available_binaries_for("pool").include?(arg) }.empty? ? ARGV : (name ? (DUP_ARG.delete("-h"); DUP_ARG) : DUP_ARG)
+new_args = DUP_ARG.map {|arg| DUP_ARG.delete(arg) unless help_array.include?(arg) || Binary.available_binaries_for("pool").include?(arg) }
+new_args = new_args.reject {|arg| Binary.available_binaries_for("pool").include?(arg) }.empty? ? ARGV : (name ? (help_array.each {|arg| DUP_ARG.delete(arg)}; DUP_ARG) : DUP_ARG)
 
 # Let's make sure if no command is passed in that we show the help message
 new_args.push("-h") unless name

data/bin/server-build-messenger

@@ -3,7 +3,7 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__), "..", "lib/erlang/messenger") )
+root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__), "..", "lib/erlang/messenger/ebin") )
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
 end
@@ -17,6 +17,7 @@ ERLC_FLAGS = "-I#{INCLUDE}"
 # erl -pa ./ebin -s pm_packager start -s init stop
 cmd =<<-EOE
   cd #{root_dir}
+  rake recompile
   rake build_boot_scripts
 EOE
 

data/bin/server-start-node

@@ -3,29 +3,26 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-available_monitors = PoolParty::Monitors.available_monitors
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
   opts.on('-l', '--no-shell', 'No shell') {optioner.noshell true}
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
+available_monitors = PoolParty::Monitors.available_monitors
 
 @hostname = o.hostname ? o.hostname : `hostname`.chomp
 @hostname = "node0" if @hostname == "master" # Quick fix to make sure we have a node running on the master as well
 
-@clouds = extract_cloud_from_options o
-
-@clouds.each do |cloud|
+o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
     # TODO: Change this to be app specfic
     # SECURITY RISK
     
     boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
-    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
+    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"} -- #{available_monitors.join(" ")}")
+    
+    vputs "Running #{command}"
     
     Kernel.system "exec #{command}" unless testing
   end  

data/config/hoe.rb

@@ -1,9 +1,10 @@
-require 'PoolParty/version'
+require 'poolparty'
 
 AUTHOR = 'Ari Lerner'  # can also be an array of Authors
 EMAIL = "ari.lerner@citrusbyte.com"
 DESCRIPTION =<<-EOM      
-  Self-healing, auto-scaling cloud computing tool
+  Self-healing, auto-scaling system administration, provisioning
+  and maintaining tool that makes cloud computing fun and easy
 EOM
 GEM_NAME = 'poolparty' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'poolparty' # The unix name for your project
@@ -63,6 +64,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/**/test_*.rb"]
   p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+  # p.files = %w(Rakefile History.txt README.txt) + Dir.glob("{examples,lib,specs,tasks,script,generators,bin}/**/*")
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")

data/lib/erlang/messenger/Rakefile

@@ -39,6 +39,12 @@ task :run_tests => [:compile] do
   end
 end
 
+desc "Clean the beams from the ebin directory"
+task :clean do
+  cmd = "rm ebin/*.beam"
+  Kernel.system cmd
+end
+
 desc "Recompile the sources"
 task :recompile => [:clean, :compile]
 

data/lib/erlang/messenger/include/defines.hrl

@@ -1,5 +1,7 @@
 % Includes file for the PoolParty Messenger
 
+% -define(debug, true).
+
 -ifdef(debug).
 
 -define (MASTER_LOCATION, erlang:list_to_atom(lists:append("master@", element(2, inet:gethostname()))) ).
@@ -13,4 +15,8 @@
 -endif.
 
 -define (MASTER_NODE_NAME, master).
--define (MASTER_SERVER, global:whereis_name(pm_master)).
+-define (MASTER_SERVER, global:whereis_name(pm_master)).
+
+-define(DICT, dict).
+-record (node, 
+					{load}).

data/lib/erlang/messenger/pm_master_rel-0.1.script

@@ -1,4 +1,4 @@
-%% script generated at {2008,10,25} {16,17,48}
+%% script generated at {2008,11,10} {0,51,31}
 {script,
     {"master","0.1"},
     [{preLoaded,
@@ -68,7 +68,9 @@
           overload,misc_supp,format_lib_supp,erlsrv,alarm_handler]},
      {path,
          ["/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/poolparty/lib/erlang/messenger/ebin"]},
-     {primLoad,[utils,pm_master_supervisor,pm_master,master_app]},
+     {primLoad,
+         [utils,pm_master_supervisor,pm_master_event_handler,
+          pm_master,pm_event_manager,master_app]},
      {progress,modules_loaded},
      {path,
          ["/opt/local/lib/erlang/lib/kernel-2.12.2/ebin",
@@ -222,7 +224,9 @@
                   [{description,"Master Server for PoolParty"},
                    {vsn,"0.1"},
                    {id,[]},
-                   {modules,[master_app,pm_master,pm_master_supervisor,utils]},
+                   {modules,
+                       [master_app,pm_master,pm_master_supervisor,utils,
+                        pm_event_manager,pm_master_event_handler]},
                    {registered,[pm_master,pm_master_supervisor]},
                    {applications,[kernel,stdlib]},
                    {included_applications,[]},

data/lib/erlang/messenger/pm_node_rel-0.1.script

@@ -1,4 +1,4 @@
-%% script generated at {2008,10,25} {16,17,48}
+%% script generated at {2008,11,10} {0,51,26}
 {script,
     {"node","0.1"},
     [{preLoaded,
@@ -68,7 +68,9 @@
           overload,misc_supp,format_lib_supp,erlsrv,alarm_handler]},
      {path,
          ["/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/poolparty/lib/erlang/messenger/ebin"]},
-     {primLoad,[utils,pm_node_supervisor,pm_node,node_app]},
+     {primLoad,
+         [utils,pm_node_supervisor,pm_node,pm_event_manager,
+          node_app]},
      {progress,modules_loaded},
      {path,
          ["/opt/local/lib/erlang/lib/kernel-2.12.2/ebin",
@@ -222,7 +224,9 @@
                   [{description,"Node Server for PoolParty"},
                    {vsn,"0.1"},
                    {id,[]},
-                   {modules,[node_app,pm_node,pm_node_supervisor,utils]},
+                   {modules,
+                       [node_app,pm_node,pm_node_supervisor,utils,
+                        pm_event_manager]},
                    {registered,[pm_node,pm_node_supervisor]},
                    {applications,[kernel,stdlib]},
                    {included_applications,[]},

data/lib/erlang/messenger/src/pm_master.erl

@@ -10,19 +10,27 @@
 
 -include_lib("../include/defines.hrl").
 
--record(state, {}).
+-record(state, {
+					nodes = ?DICT:new()  % Dictionary of running nodes
+				}).
+				
 -define (SERVER, global:whereis_name(?MODULE)).
 
 %% API
--export([start_link/0]).
 
 %% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3]).
+-export([start_link/0,
+         stop/0,
+         init/1,
+         handle_call/3,
+         handle_cast/2,
+         handle_info/2,
+         terminate/2,
+         code_change/3]).
 
 % Client function definitions
 -export ([get_load/1, reconfigure_cloud/0]).
--export ([run_cmd/1, fire_cmd/1]).
+-export ([run_cmd/1, fire_cmd/1, get_current_nodes/0]).
 -export ([shutdown_cloud/0]).
 
 %%====================================================================
@@ -32,15 +40,15 @@
 %%% Internal functions
 %%--------------------------------------------------------------------
 
-% pm_master:get_load("0", "cpu").
+% pm_master:get_load("cpu").
 get_load(Type) ->
 	% {Loads, _} = pm_cluster:send_call(get_load_for_type, [Type]),
-	{Loads, _} = gen_server:call(?SERVER, {get_load_for_type, [Type]}),
-	utils:convert_responses_to_int_list(Loads).
+	% {Loads, _} = gen_server:call(?SERVER, {get_load, [Type]}),
+	Loads = gen_server:call(?SERVER, {get_current_load, Type}),
+	utils:average_of_list(Loads).
 
 % Send reconfigure tasks to every node
-reconfigure_cloud() ->
-	gen_server:call(?SERVER, {run_reconfig}).
+reconfigure_cloud() -> gen_server:cast(?SERVER, {force_reconfig}).
 
 % Fire the given command on all nodes
 run_cmd(Cmd) -> gen_server:call(?SERVER, {run_cmd, Cmd}).
@@ -50,6 +58,11 @@ fire_cmd(Cmd) -> gen_server:call(?SERVER, {fire_cmd, Cmd}).
 shutdown_cloud() ->
 	pm_cluster:send_call(stop, []),
 	{ok}.
+
+get_current_nodes() ->
+	gen_server:call(?SERVER, {get_live_nodes}).
+
+stop() -> gen_server:cast(?MODULE, stop).	
 %%--------------------------------------------------------------------
 %% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
 %% Description: Starts the server
@@ -70,7 +83,10 @@ start_link() ->
 %%--------------------------------------------------------------------
 init([]) ->
 	% pm_event_manager:add_handler(pm_master_event_handler),
-  {ok, #state{}}.
+	process_flag(trap_exit, true),
+  {ok, #state{
+		nodes = ?DICT:new()
+	}}.
 
 %%--------------------------------------------------------------------
 %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
@@ -82,14 +98,21 @@ init([]) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 % Handle load messages
-handle_call({Type, Args}, _From, _State) ->
-	Nodes = pm_cluster:get_live_nodes(),
-	List = rpc:multicall(Nodes, pm_node, Type, [Args]),
-	{reply, List, nostate};
-handle_call(Request, _From, State) ->
-	Nodes = pm_cluster:get_live_nodes(),
-	Reply = Reply = rpc:multicall(Nodes, pm_node, Request, []),
-	{reply, Reply, State}.
+handle_call({get_load, Args}, _From, State) ->
+		Nodes = pm_cluster:get_live_nodes(),
+		List = rpc:multicall(Nodes, pm_node, get_load_for_type, [Args]),
+		{reply, List, State};		
+handle_call({get_current_load, Type}, _From, State) ->
+	LoadForType = get_load_for_type(Type, State),
+	?TRACE("LoadForType: ",[LoadForType]),
+	{reply, LoadForType, State};
+handle_call({get_live_nodes}, _From, State) ->
+	{reply, get_live_nodes(State), State}.
+	
+% handle_call(_Request, _From, State) ->
+	% Nodes = pm_cluster:get_live_nodes(),
+	% Reply = Reply = rpc:multicall(Nodes, pm_node, Request, []),
+	% {reply, Reply, State}.
 
 %%--------------------------------------------------------------------
 %% Function: handle_cast(Msg, State) -> {noreply, State} |
@@ -97,6 +120,18 @@ handle_call(Request, _From, State) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
+handle_cast({update_node_load, From, Loads}, State) ->
+	% ?TRACE("Cast with load message", [From, Loads]),
+	% {_Nodes, NewState} = get_node_listing(From, State),
+	% {noreply, NewState};
+	{_LoadState, NewState} = store_load_for(From, Loads, State),
+	{noreply, NewState};
+handle_cast({force_reconfig}, State) ->
+	Fun = fun(NodeEntry) ->
+		{_Node, Pid} = NodeEntry,
+		gen_server:cast(Pid, {reconfig}) end,
+	run_on_nodes(Fun, State),
+	{noreply, State};
 handle_cast(_Msg, State) ->
   {noreply, State}.
 
@@ -124,4 +159,53 @@ terminate(_Reason, _State) ->
 %% Description: Convert process state when code is changed
 %%--------------------------------------------------------------------
 code_change(_OldVsn, State, _Extra) ->
-  {ok, State}.
+  {ok, State}.
+
+% Private methods
+get_node_listing(Name, State) ->
+	% Find or create the stored node	
+	case ?DICT:is_key(Name, State#state.nodes) of
+		true -> NodeStore = ?DICT:fetch(Name, State#state.nodes), {NodeStore, State};
+		false -> 
+			NodeStore = {},  NewState = State#state{nodes = ?DICT:store(Name, NodeStore, State#state.nodes)}, {NodeStore, NewState}
+	end.
+
+get_load_for_type(Type, State) ->
+	Loads = [ get_load_for_node(Type, Name, State) || Name <- get_live_nodes(State) ],
+	[Load || Load <- Loads, Load =/= false, Load > 0.0].
+
+get_load_for_node(Type, Name, State) ->
+	{NodeStore, _} = get_node_listing(Name, State),
+	case proplists:is_defined(erlang:list_to_atom(Type), NodeStore) of
+		true -> proplists:get_value(erlang:list_to_atom(Type), NodeStore);
+		_ -> false
+	end.
+
+get_node_pids(State) ->
+	Nodes = dict:fetch_keys(State#state.nodes),	
+	[ {Node, global:whereis_name(Node)} || Node <- Nodes, global:whereis_name(Node) =/= undefined].
+	
+get_live_nodes(State) ->
+	NodePids = get_node_pids(State),
+	RespondingNodes = lists:map(
+	fun(NodeEntry) ->
+		{Node, Pid} = NodeEntry,
+		case is_pid(Pid) of
+			true ->
+				case gen_server:call(Pid, {still_there}) of
+					still_here -> Node;
+					_ -> false
+				end;
+			false -> false
+		end
+	end, NodePids),
+	[ Node || Node <- RespondingNodes, Node =/= false].
+
+run_on_nodes(Fun, State) ->
+	NodePids = get_node_pids(State),
+	lists:map(Fun, NodePids).
+	
+store_load_for(Name, Loads, State) ->
+	NewNodeEntry = [ {erlang:list_to_atom(Key), erlang:list_to_float(proplists:get_value(Key, Loads))} || Key <- proplists:get_keys(Loads) ],
+	NewState = ?DICT:store(Name, NewNodeEntry, State#state.nodes),
+	{NewNodeEntry, State#state{nodes = NewState}}.