auser-poolparty 0.2.47 → 0.2.48

data/Manifest.txt

@@ -50,6 +50,7 @@ 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

data/bin/server-get-load

@@ -20,7 +20,7 @@ include Remote
   
   with_cloud(cl, {:testing => o.testing, :monitorname => @monitor }) do
     if PoolParty::Monitors.available_monitors.include?(monitorname.downcase.to_sym)
-      print "PoolParty::Monitors::#{monitorname.capitalize}Monitor".constantize.run
+      print "PoolParty::Monitors::#{monitorname.capitalize}Monitor".constantize.run.to_f
     else
       puts "Unknown monitor"
     end

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

@@ -1,4 +1,4 @@
-%% script generated at {2008,11,10} {0,51,31}
+%% script generated at {2008,11,10} {4,29,23}
 {script,
     {"master","0.1"},
     [{preLoaded,

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

@@ -1,4 +1,4 @@
-%% script generated at {2008,11,10} {0,51,26}
+%% script generated at {2008,11,10} {4,29,23}
 {script,
     {"node","0.1"},
     [{preLoaded,

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

@@ -45,8 +45,7 @@ provision_orphan_running_servers() ->
 	end.
 
 % Get a list of the live nodes
-get_live_nodes() -> 
-	pm_cluster:get_live_nodes().
+get_live_nodes() -> pm_master:get_current_nodes().
 % Terminate the cloud messenger
 % This sends a shutdown to the whole cloud
 shutdown() -> 

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

@@ -59,8 +59,7 @@ shutdown_cloud() ->
 	pm_cluster:send_call(stop, []),
 	{ok}.
 
-get_current_nodes() ->
-	gen_server:call(?SERVER, {get_live_nodes}).
+get_current_nodes() -> gen_server:call(?SERVER, {get_live_nodes}).
 
 stop() -> gen_server:cast(?MODULE, stop).	
 %%--------------------------------------------------------------------
@@ -206,6 +205,6 @@ run_on_nodes(Fun, 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) ],
+	NewNodeEntry = [ {erlang:list_to_atom(Key), proplists:get_value(Key, Loads)} || Key <- proplists:get_keys(Loads)],
 	NewState = ?DICT:store(Name, NewNodeEntry, State#state.nodes),
 	{NewNodeEntry, State#state{nodes = NewState}}.

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

@@ -27,7 +27,7 @@ tick_timer(Time, Fun) ->
 end. 
 
 average_of_list(L) ->
-	Sum = lists:foldr( fun(Int, Sum) -> Int + Sum end, 0, [F || F <- L] ),
+	Sum = lists:foldr( fun(Int, Sum) -> erlang:list_to_float(Int) + Sum end, 0, [F || F <- L] ),
 	average_for_list(Sum, L).
 
 % Get the average of the list

data/lib/erlang/messenger/useful_snippets

@@ -6,7 +6,7 @@
 % erl -pa ./ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -setcookie poolparty -boot pm_node_rel-0.1 -sname node1
 
 % Starting the client on the master
-% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.46/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.47/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
 
 % Get the load
 % erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.46/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start

data/lib/poolparty/monitors/base_monitor.rb

@@ -23,7 +23,7 @@ module PoolParty
       args.each do |arg|
         (available_monitors << "#{arg}".downcase.to_sym)
         
-        InstanceMethods.module_eval "def #{arg}; @#{arg} ||= PoolParty::Messenger.messenger_send!(\"get_load #{arg}\").to_f rescue -1; end"
+        InstanceMethods.module_eval "def #{arg}; @#{arg} ||= PoolParty::Messenger.messenger_send!(\"get_load #{arg}\").to_f rescue -1.0; end"
       end
     end
 

data/lib/poolparty/monitors/monitors/memory_monitor.rb

@@ -32,7 +32,7 @@ module PoolParty
       end
       
       def nix_memory_usage
-        str = %x[free -m #{unix_hide_string} | grep -i mem]
+        str = %x[free -m | grep -i mem]
         begin
           total_memory = str.split[1].to_f
           used_memory = str.split[2].to_f

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 47
+    TINY  = 48
 
     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.47
+  version: 0.2.48
 platform: ruby
 authors: 
 - Ari Lerner
@@ -152,6 +152,7 @@ files:
 - 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.47
+  version: 0.2.48
 platform: ruby
 authors: 
 - Ari Lerner
@@ -152,6 +152,7 @@ files:
 - 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