auser-poolparty 0.2.48 → 0.2.49

data/Manifest.txt

@@ -19,8 +19,8 @@ bin/cloud-refresh
 bin/cloud-run
 bin/cloud-ssh
 bin/cloud-start
+bin/cloud-stats
 bin/cloud-terminate
-bin/messenger-get-load
 bin/pool
 bin/pool-console
 bin/pool-describe
@@ -34,6 +34,7 @@ bin/server-list-active
 bin/server-list-responding
 bin/server-rerun
 bin/server-show-stats
+bin/server-start-client
 bin/server-start-master
 bin/server-start-node
 config/hoe.rb
@@ -50,6 +51,9 @@ lib/erlang/messenger/Makefile
 lib/erlang/messenger/README
 lib/erlang/messenger/Rakefile
 lib/erlang/messenger/control
+lib/erlang/messenger/ebin/client.app
+lib/erlang/messenger/ebin/client_app.beam
+lib/erlang/messenger/ebin/client_server.beam
 lib/erlang/messenger/ebin/erl_crash.dump
 lib/erlang/messenger/ebin/master.app
 lib/erlang/messenger/ebin/master_app.beam
@@ -57,6 +61,9 @@ lib/erlang/messenger/ebin/node.app
 lib/erlang/messenger/ebin/node_app.beam
 lib/erlang/messenger/ebin/packager.app
 lib/erlang/messenger/ebin/pm_client.beam
+lib/erlang/messenger/ebin/pm_client_old.beam
+lib/erlang/messenger/ebin/pm_client_rel-0.1.rel
+lib/erlang/messenger/ebin/pm_client_supervisor.beam
 lib/erlang/messenger/ebin/pm_cluster.beam
 lib/erlang/messenger/ebin/pm_event_manager.beam
 lib/erlang/messenger/ebin/pm_master.beam
@@ -125,13 +132,20 @@ 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/log/pool.logs
+lib/erlang/messenger/pm_client_rel-0.1.boot
+lib/erlang/messenger/pm_client_rel-0.1.script
 lib/erlang/messenger/pm_master_rel-0.1.boot
 lib/erlang/messenger/pm_master_rel-0.1.script
 lib/erlang/messenger/pm_node_rel-0.1.boot
 lib/erlang/messenger/pm_node_rel-0.1.script
+lib/erlang/messenger/src/client_app.erl
+lib/erlang/messenger/src/client_server.erl
 lib/erlang/messenger/src/master_app.erl
 lib/erlang/messenger/src/node_app.erl
 lib/erlang/messenger/src/pm_client.erl
+lib/erlang/messenger/src/pm_client_old.erl
+lib/erlang/messenger/src/pm_client_supervisor.erl
 lib/erlang/messenger/src/pm_cluster.erl
 lib/erlang/messenger/src/pm_event_manager.erl
 lib/erlang/messenger/src/pm_master.erl

data/Rakefile

@@ -21,7 +21,7 @@ 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|
+task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :build_local_gem] do |t|
   res = %x[rake debug_gem]
   res = res.split("\n")[1..-1].join("\n")
   ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f|

data/bin/cloud-stats

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Stats for cloud name')    { |c| optioner.cloudname c }
+end
+
+o.loaded_clouds.each do |cloud|
+
+  with_cloud(cloud) do
+    puts header("#{name.to_s.capitalize} cloud stats")
+    run_command_on(". /etc/profile && server-show-stats", master)
+  end
+
+end

data/bin/server-get-load

@@ -9,14 +9,9 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-m name', '--monitor monitor_name', "Monitor name (default: cpu) (Available monitors: #{available_monitors.join(", ")})") {|c| optioner.monitorname c}
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = extract_cloud_from_options o
 @monitor = o.monitorname ? o.monitorname : "cpu"
 
-@clouds.each do |cl|
+o.loaded_clouds.each do |cl|
   
   with_cloud(cl, {:testing => o.testing, :monitorname => @monitor }) do
     if PoolParty::Monitors.available_monitors.include?(monitorname.downcase.to_sym)

data/bin/server-show-stats

@@ -3,17 +3,10 @@ $:.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|
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = extract_cloud_from_options o
-
-@clouds.each do |cloud|
+o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud, {:testing => o.testing }) do    
     puts header("Stats")

data/bin/server-start-client

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
+end
+
+o.loaded_clouds.each do |cloud|
+  
+  with_cloud(cloud) do
+    
+    boot_file = "#{Messenger.append_dir}/pm_client_rel-0.1"
+    command = Messenger.erl_command("client", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}", 7050, 7050)
+    
+    vputs "Running #{command}"
+    
+    Kernel.system "exec #{command}" unless testing
+  end  
+  
+end

data/bin/server-start-master

@@ -3,20 +3,13 @@ $:.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 }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = extract_cloud_from_options o
-
-@clouds.each do |cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :verbose => o.verbose }) do
+  with_cloud(cloud) do
     
     boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
     command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")

data/lib/erlang/messenger/ebin/client.app

@@ -0,0 +1,19 @@
+{application, client,
+  [
+		% Quick description of the server
+		{description, "Client Server for PoolParty"},
+		% Version
+		{vsn, "0.1"},
+		% All modules used by the application.  
+		{modules, [client_app, pm_client, client_server, pm_client_supervisor, utils]},
+		% All the registered names in the application
+		{registered, [client_server, pm_client_supervisor]},
+		% These must be started for application to run
+		{applications, [kernel, stdlib]},
+		% Environment vars
+		{env, []},
+		% Module and Args used to start
+		{mod, {client_app, []}},
+		{start_phases, []}
+	]
+}.

data/lib/erlang/messenger/ebin/pm_client_rel-0.1.rel

@@ -0,0 +1 @@
+{release, {"client","0.1"}, {erts,"5.6.2"},[{kernel,"2.12.2"},{stdlib,"1.15.2"},{inets,"5.0.5"},{crypto,"1.5.1.1"},{sasl,"2.1.5.2"},{client,"0.1"}]}.

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

@@ -0,0 +1,246 @@
+%% script generated at {2008,11,10} {16,32,20}
+{script,
+    {"client","0.1"},
+    [{preLoaded,
+         [erlang,erl_prim_loader,prim_file,prim_inet,init,otp_ring0]},
+     {progress,preloaded},
+     {path,
+         ["/opt/local/lib/erlang/lib/kernel-2.12.2/ebin",
+          "/opt/local/lib/erlang/lib/stdlib-1.15.2/ebin"]},
+     {primLoad,[error_handler]},
+     {kernel_load_completed},
+     {progress,kernel_load_completed},
+     {path,["/opt/local/lib/erlang/lib/kernel-2.12.2/ebin"]},
+     {primLoad,
+         [zlib,wrap_log_reader,user_sup,user_drv,user,seq_trace,rpc,
+          ram_file,pg2,packages,os,net_kernel,net_adm,net,
+          kernel_config,kernel,inet_udp,inet_tcp_dist,inet_tcp,
+          inet_sctp,inet_res,inet_parse,inet_hosts,
+          inet_gethost_native,inet_dns,inet_db,inet_config,inet6_udp,
+          inet6_tcp_dist,inet6_tcp,inet,hipe_unified_loader,heart,
+          group,global_search,global_group,global,gen_udp,gen_tcp,
+          gen_sctp,file_server,file_io_server,file,erts_debug,
+          error_logger,erl_reply,erl_epmd,erl_distribution,erl_ddll,
+          erl_boot_server,dist_util,dist_ac,disk_log_sup,
+          disk_log_server,disk_log_1,disk_log,code_server,code_aux,
+          code,auth,application_starter,application_master,
+          application_controller,application]},
+     {path,["/opt/local/lib/erlang/lib/stdlib-1.15.2/ebin"]},
+     {primLoad,
+         [zip,win32reg,timer,sys,supervisor_bridge,supervisor,string,
+          sofs,slave,shell_default,shell,sets,regexp,random,queue,
+          qlc_pt,qlc,proplists,proc_lib,pool,pg,otp_internal,ordsets,
+          orddict,ms_transform,math,log_mf_h,lists,lib,io_lib_pretty,
+          io_lib_fread,io_lib_format,io_lib,io,gen_server,gen_fsm,
+          gen_event,gen,gb_trees,gb_sets,filename,filelib,file_sorter,
+          eval_bits,ets,escript,error_logger_tty_h,
+          error_logger_file_h,erl_tar,erl_scan,erl_pp,erl_posix_msg,
+          erl_parse,erl_lint,erl_internal,erl_expand_records,erl_eval,
+          erl_compile,erl_bits,epp,edlin_expand,edlin,digraph_utils,
+          digraph,dict,dets_v9,dets_v8,dets_utils,dets_sup,
+          dets_server,dets,calendar,c,beam_lib,base64,array]},
+     {path,["/opt/local/lib/erlang/lib/inets-5.0.5/ebin"]},
+     {primLoad,
+         [tftp_sup,tftp_lib,tftp_file,tftp_engine,tftp_binary,tftp,
+          mod_trace,mod_security_server,mod_security,
+          mod_responsecontrol,mod_range,mod_log,mod_include,
+          mod_htaccess,mod_head,mod_get,mod_esi,mod_disk_log,mod_dir,
+          mod_cgi,mod_browser,mod_auth_server,mod_auth_plain,
+          mod_auth_mnesia,mod_auth_dets,mod_auth,mod_alias,
+          mod_actions,inets_sup,inets_service,inets_app,inets,
+          httpd_util,httpd_sup,httpd_socket,httpd_script_env,
+          httpd_response,httpd_request_handler,httpd_request,
+          httpd_misc_sup,httpd_manager,httpd_log,httpd_instance_sup,
+          httpd_file,httpd_example,httpd_esi,httpd_conf,httpd_cgi,
+          httpd_acceptor_sup,httpd_acceptor,httpd,httpc_sup,
+          httpc_response,httpc_request,httpc_profile_sup,
+          httpc_manager,httpc_handler_sup,httpc_handler,http_util,
+          http_uri,http_transport,http_response,http_request,
+          http_cookie,http_chunk,http,ftp_sup,ftp_response,
+          ftp_progress,ftp]},
+     {path,["/opt/local/lib/erlang/lib/crypto-1.5.1.1/ebin"]},
+     {primLoad,[crypto_sup,crypto_server,crypto_app,crypto]},
+     {path,["/opt/local/lib/erlang/lib/sasl-2.1.5.2/ebin"]},
+     {primLoad,
+         [systools_relup,systools_rc,systools_make,systools_lib,
+          systools,sasl_report_tty_h,sasl_report_file_h,sasl_report,
+          sasl,release_handler_1,release_handler,rb_format_supp,rb,
+          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_client_supervisor,pm_client,client_server,
+          client_app]},
+     {progress,modules_loaded},
+     {path,
+         ["/opt/local/lib/erlang/lib/kernel-2.12.2/ebin",
+          "/opt/local/lib/erlang/lib/stdlib-1.15.2/ebin",
+          "/opt/local/lib/erlang/lib/inets-5.0.5/ebin",
+          "/opt/local/lib/erlang/lib/crypto-1.5.1.1/ebin",
+          "/opt/local/lib/erlang/lib/sasl-2.1.5.2/ebin",
+          "/Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/poolparty/lib/erlang/messenger/ebin"]},
+     {kernelProcess,heart,{heart,start,[]}},
+     {kernelProcess,error_logger,{error_logger,start_link,[]}},
+     {kernelProcess,application_controller,
+         {application_controller,start,
+             [{application,kernel,
+                  [{description,"ERTS  CXC 138 10"},
+                   {vsn,"2.12.2"},
+                   {id,[]},
+                   {modules,
+                       [application,application_controller,application_master,
+                        application_starter,auth,code,code_aux,packages,
+                        code_server,dist_util,erl_boot_server,
+                        erl_distribution,erl_prim_loader,erl_reply,erlang,
+                        error_handler,error_logger,file,file_server,
+                        file_io_server,prim_file,global,global_group,
+                        global_search,group,heart,hipe_unified_loader,
+                        inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,
+                        inet_hosts,inet_gethost_native,inet_tcp_dist,init,
+                        kernel,kernel_config,net,net_adm,net_kernel,os,
+                        ram_file,rpc,user,user_drv,user_sup,disk_log,
+                        disk_log_1,disk_log_server,disk_log_sup,dist_ac,
+                        erl_ddll,erl_epmd,erts_debug,gen_tcp,gen_udp,gen_sctp,
+                        prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,
+                        inet_tcp,inet_udp,inet_sctp,pg2,seq_trace,
+                        wrap_log_reader,zlib,otp_ring0]},
+                   {registered,
+                       [application_controller,erl_reply,auth,boot_server,
+                        code_server,disk_log_server,disk_log_sup,
+                        erl_prim_loader,error_logger,file_server_2,
+                        fixtable_server,global_group,global_name_server,heart,
+                        init,kernel_config,kernel_sup,net_kernel,net_sup,rex,
+                        user,os_server,ddll_server,erl_epmd,inet_db,pg2]},
+                   {applications,[]},
+                   {included_applications,[]},
+                   {env,[{error_logger,tty}]},
+                   {start_phases,undefined},
+                   {maxT,infinity},
+                   {maxP,infinity},
+                   {mod,{kernel,[]}}]}]}},
+     {progress,init_kernel_started},
+     {apply,
+         {application,load,
+             [{application,stdlib,
+                  [{description,"ERTS  CXC 138 10"},
+                   {vsn,"1.15.2"},
+                   {id,[]},
+                   {modules,
+                       [array,base64,beam_lib,c,calendar,dets,dets_server,
+                        dets_sup,dets_utils,dets_v8,dets_v9,dict,digraph,
+                        digraph_utils,edlin,edlin_expand,epp,eval_bits,
+                        erl_bits,erl_compile,erl_eval,erl_expand_records,
+                        erl_internal,erl_lint,erl_parse,erl_posix_msg,erl_pp,
+                        erl_scan,erl_tar,error_logger_file_h,
+                        error_logger_tty_h,escript,ets,file_sorter,filelib,
+                        filename,gb_trees,gb_sets,gen,gen_event,gen_fsm,
+                        gen_server,io,io_lib,io_lib_format,io_lib_fread,
+                        io_lib_pretty,lib,lists,log_mf_h,math,ms_transform,
+                        orddict,ordsets,otp_internal,pg,pool,proc_lib,
+                        proplists,qlc,qlc_pt,queue,random,regexp,sets,shell,
+                        shell_default,slave,sofs,string,supervisor,
+                        supervisor_bridge,sys,timer,win32reg,zip]},
+                   {registered,
+                       [timer_server,rsh_starter,take_over_monitor,
+                        pool_master,dets]},
+                   {applications,[kernel]},
+                   {included_applications,[]},
+                   {env,[]},
+                   {start_phases,undefined},
+                   {maxT,infinity},
+                   {maxP,infinity}]}]}},
+     {apply,
+         {application,load,
+             [{application,inets,
+                  [{description,"INETS  CXC 138 49"},
+                   {vsn,"5.0.5"},
+                   {id,[]},
+                   {modules,
+                       [inets,inets_sup,inets_app,inets_service,ftp,
+                        ftp_progress,ftp_response,ftp_sup,http,httpc_handler,
+                        httpc_handler_sup,httpc_manager,httpc_profile_sup,
+                        httpc_request,httpc_response,httpc_sup,http_cookie,
+                        http_uri,http_chunk,http_request,http_response,
+                        http_transport,http_util,httpd,httpd_acceptor,
+                        httpd_acceptor_sup,httpd_cgi,httpd_conf,httpd_esi,
+                        httpd_example,httpd_file,httpd_instance_sup,httpd_log,
+                        httpd_manager,httpd_misc_sup,httpd_request,
+                        httpd_request_handler,httpd_response,httpd_script_env,
+                        httpd_socket,httpd_sup,httpd_util,mod_actions,
+                        mod_alias,mod_auth,mod_auth_dets,mod_auth_mnesia,
+                        mod_auth_plain,mod_auth_server,mod_browser,mod_cgi,
+                        mod_dir,mod_disk_log,mod_esi,mod_get,mod_head,
+                        mod_htaccess,mod_include,mod_log,mod_range,
+                        mod_responsecontrol,mod_security,mod_security_server,
+                        mod_trace,tftp,tftp_binary,tftp_engine,tftp_file,
+                        tftp_lib,tftp_sup]},
+                   {registered,[inets_sup,httpc_manager]},
+                   {applications,[kernel,stdlib]},
+                   {included_applications,[]},
+                   {env,[]},
+                   {start_phases,undefined},
+                   {maxT,infinity},
+                   {maxP,infinity},
+                   {mod,{inets_app,[]}}]}]}},
+     {apply,
+         {application,load,
+             [{application,crypto,
+                  [{description,"CRYPTO version 1"},
+                   {vsn,"1.5.1.1"},
+                   {id,[]},
+                   {modules,[crypto,crypto_app,crypto_sup,crypto_server]},
+                   {registered,[crypto_sup,crypto_server]},
+                   {applications,[kernel,stdlib]},
+                   {included_applications,[]},
+                   {env,[]},
+                   {start_phases,undefined},
+                   {maxT,infinity},
+                   {maxP,infinity},
+                   {mod,{crypto_app,[]}}]}]}},
+     {apply,
+         {application,load,
+             [{application,sasl,
+                  [{description,"SASL  CXC 138 11"},
+                   {vsn,"2.1.5.2"},
+                   {id,[]},
+                   {modules,
+                       [sasl,alarm_handler,format_lib_supp,misc_supp,overload,
+                        rb,rb_format_supp,release_handler,release_handler_1,
+                        erlsrv,sasl_report,sasl_report_tty_h,
+                        sasl_report_file_h,systools,systools_make,systools_rc,
+                        systools_relup,systools_lib]},
+                   {registered,
+                       [sasl_sup,alarm_handler,overload,release_handler]},
+                   {applications,[kernel,stdlib]},
+                   {included_applications,[]},
+                   {env,[{sasl_error_logger,tty},{errlog_type,all}]},
+                   {start_phases,undefined},
+                   {maxT,infinity},
+                   {maxP,infinity},
+                   {mod,{sasl,[]}}]}]}},
+     {apply,
+         {application,load,
+             [{application,client,
+                  [{description,"Client Server for PoolParty"},
+                   {vsn,"0.1"},
+                   {id,[]},
+                   {modules,
+                       [client_app,pm_client,client_server,
+                        pm_client_supervisor,utils]},
+                   {registered,[client_server,pm_client_supervisor]},
+                   {applications,[kernel,stdlib]},
+                   {included_applications,[]},
+                   {env,[]},
+                   {start_phases,[]},
+                   {maxT,infinity},
+                   {maxP,infinity},
+                   {mod,{client_app,[]}}]}]}},
+     {progress,applications_loaded},
+     {apply,{application,start_boot,[kernel,permanent]}},
+     {apply,{application,start_boot,[stdlib,permanent]}},
+     {apply,{application,start_boot,[inets,permanent]}},
+     {apply,{application,start_boot,[crypto,permanent]}},
+     {apply,{application,start_boot,[sasl,permanent]}},
+     {apply,{application,start_boot,[client,permanent]}},
+     {apply,{c,erlangrc,[]}},
+     {progress,started}]}.

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

@@ -1,4 +1,4 @@
-%% script generated at {2008,11,10} {4,29,23}
+%% script generated at {2008,11,10} {16,32,20}
 {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} {4,29,23}
+%% script generated at {2008,11,10} {16,32,20}
 {script,
     {"node","0.1"},
     [{preLoaded,

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

@@ -0,0 +1,39 @@
+-module (client_app).
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+%%====================================================================
+%% Application callbacks
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: start(Type, StartArgs) -> {ok, Pid} |
+%%                                     {ok, Pid, State} |
+%%                                     {error, Reason}
+%% Description: This function is called whenever an application
+%% is started using application:start/1,2, and should start the processes
+%% of the application. If the application is structured according to the
+%% OTP design principles as a supervision tree, this means starting the
+%% top supervisor of the tree.
+%%--------------------------------------------------------------------
+start(_Type, StartArgs) ->
+  case pm_client_supervisor:start_link(StartArgs) of
+    {ok, Pid} -> 
+      {ok, Pid};
+    Error ->
+      Error
+  end.
+
+%%--------------------------------------------------------------------
+%% Function: stop(State) -> void()
+%% Description: This function is called whenever an application
+%% has stopped. It is intended to be the opposite of Module:start/2 and
+%% should do any necessary cleaning up. The return value is ignored.
+%%--------------------------------------------------------------------
+stop(_State) ->
+  ok.
+
+%%====================================================================
+%% Internal functions
+%%====================================================================

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

@@ -0,0 +1,43 @@
+-module (client_server).
+-include_lib("../include/defines.hrl").
+-export([loop/1, connect_to_master/0]).
+-export ([start/0]).
+
+-define (RECONNECT_TIMEOUT, 10000).
+
+start() -> 
+	?TRACE("MASTER_LOCATION", [?MASTER_LOCATION]),
+	connect_to_master(),
+	global:sync(),
+	pm_client:start(?MODULE, 7050, {?MODULE, loop}).
+	
+master_server() -> global:whereis_name(pm_master).
+
+loop(Socket) ->
+    case gen_tcp:recv(Socket, 0) of
+        {ok, Data} ->
+						?TRACE("received", [master_server(), erlang:binary_to_list(Data)]),
+						% Args = [Item || K <- string:tokens(erlang:binary_to_list(Data), " "), Item <- erlang:list_to_atom(K)],
+						[Meth|Args] = string:tokens(erlang:binary_to_list(Data), " "),
+						?TRACE("received", [Meth, Args]),
+						Output = gen_server:call(master_server(), {erlang:list_to_atom(Meth), Args}),
+						?TRACE("received from gen_server", [Output]),
+            gen_tcp:send(Socket, erlang:float_to_list(Output)),
+						io:format("~p~n", [Output]),
+						?TRACE("posted", [Output]),
+            loop(Socket);
+        {error, closed} ->
+            ok
+    end.
+
+connect_to_master() ->
+	case net_adm:ping(?MASTER_LOCATION) of
+		pong ->
+			ok;
+		_ ->
+			receive 
+				stop -> void 
+			after ?RECONNECT_TIMEOUT -> 
+				connect_to_master()
+			end
+	end.

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

@@ -1,52 +1,49 @@
 -module (pm_client).
--include_lib("../include/defines.hrl").
-
--export ([reconfigure_cloud/0, get_load/1, get_live_nodes/0, start/0]).
--export ([run_cmd/1, fire_cmd/1]).
--export ([provision_orphan_running_servers/0]).
--export ([shutdown/0]).
-% Run commands on the running master process
-% erl -pa ./ebin/ -run pm_client get_load cpu -run init stop -noshell
-
-% Connect to the master
-start() -> 
-	pong = net_adm:ping(?MASTER_LOCATION),
-	global:sync().
-% Send the command Cmd to the pm_master process
-run_cmd(Cmd) ->	
-	Out = pm_master:run_cmd(Cmd),
-	io:format("~p", [Out]),
-	Out.
-fire_cmd(Cmd) ->	
-	Out = pm_master:fire_cmd(Cmd),
-	io:format("~p", [Out]),
-	Out.
-% Reconfigure the cloud
-reconfigure_cloud() -> pm_master:reconfigure_cloud().
-% Get the load on the cloud of type Type
-get_load(Type) -> 
-	start(),
-	Load = pm_master:get_load(Type),
-	io:format("~p", [Load]),
-	Load.
-	
-% Check to see if there are servers that are unprovisioned
-% And if there are, log in to them and start their messenger
-% sending the live code on the master to them
-provision_orphan_running_servers() ->
-	Instances = pm_cluster:any_new_servers(),
-	case lists:flatlength(Instances) of
-		0 ->
-			ok;
-		_ ->
-			utils:distribute_modules_to([pm_node, pm_node_supervisor, pm_event_manager, node_app], Instances),
-			pm_cluster:slaves(Instances),
-			Instances
-	end.
-
-% Get a list of the live nodes
-get_live_nodes() -> pm_master:get_current_nodes().
-% Terminate the cloud messenger
-% This sends a shutdown to the whole cloud
-shutdown() -> 
-	pm_master:shutdown_cloud().
+-behavior(gen_server).
+
+-export([init/1, code_change/3, handle_call/3, handle_cast/2, handle_info/2, terminate/2]).
+-export([accept_loop/1]).
+-export([start/3]).
+
+-define(TCP_OPTIONS, [binary, {packet, 0}, {active, false}, {reuseaddr, true}]).
+
+-record(server_state, {
+        port,
+        loop,
+        ip=any,
+        lsocket=null}).
+
+start(Name, Port, Loop) ->
+    State = #server_state{port = Port, loop = Loop},
+    gen_server:start_link({global, Name}, ?MODULE, State, []).
+
+init(State = #server_state{port=Port}) ->
+		process_flag(trap_exit, true),
+    case gen_tcp:listen(Port, ?TCP_OPTIONS) of
+        {ok, LSocket} ->
+            NewState = State#server_state{lsocket = LSocket},
+            {ok, accept(NewState)};
+        {error, Reason} ->
+            {stop, Reason}
+    end.
+
+handle_cast({accepted, _Pid}, State=#server_state{}) ->
+    {noreply, accept(State)}.
+
+accept_loop({Server, LSocket, {M, F}}) ->
+    {ok, Socket} = gen_tcp:accept(LSocket),
+    % Let the server spawn a new process and replace this loop
+    % with the echo loop, to avoid blocking 
+    gen_server:cast(Server, {accepted, self()}),
+    M:F(Socket).
+    
+% To be more robust we should be using spawn_link and trapping exits
+accept(State = #server_state{lsocket=LSocket, loop = Loop}) ->
+    proc_lib:spawn(?MODULE, accept_loop, [{self(), LSocket, Loop}]),
+    State.
+
+% These are just here to suppress warnings.
+handle_call(_Msg, _Caller, State) -> {noreply, State}.
+handle_info(_Msg, Library) -> {noreply, Library}.
+terminate(_Reason, _Library) -> ok.
+code_change(_OldVersion, Library, _Extra) -> {ok, Library}.

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

@@ -0,0 +1,52 @@
+-module (pm_client_old).
+-include_lib("../include/defines.hrl").
+
+-export ([reconfigure_cloud/0, get_load/1, get_live_nodes/0, start/0]).
+-export ([run_cmd/1, fire_cmd/1]).
+-export ([provision_orphan_running_servers/0]).
+-export ([shutdown/0]).
+% Run commands on the running master process
+% erl -pa ./ebin/ -run pm_client get_load cpu -run init stop -noshell
+
+% Connect to the master
+start() -> 
+	pong = net_adm:ping(?MASTER_LOCATION),
+	global:sync().
+% Send the command Cmd to the pm_master process
+run_cmd(Cmd) ->	
+	Out = pm_master:run_cmd(Cmd),
+	io:format("~p", [Out]),
+	Out.
+fire_cmd(Cmd) ->	
+	Out = pm_master:fire_cmd(Cmd),
+	io:format("~p", [Out]),
+	Out.
+% Reconfigure the cloud
+reconfigure_cloud() -> pm_master:reconfigure_cloud().
+% Get the load on the cloud of type Type
+get_load(Type) -> 
+	start(),
+	Load = pm_master:get_load(Type),
+	io:format("~p", [Load]),
+	Load.
+	
+% Check to see if there are servers that are unprovisioned
+% And if there are, log in to them and start their messenger
+% sending the live code on the master to them
+provision_orphan_running_servers() ->
+	Instances = pm_cluster:any_new_servers(),
+	case lists:flatlength(Instances) of
+		0 ->
+			ok;
+		_ ->
+			utils:distribute_modules_to([pm_node, pm_node_supervisor, pm_event_manager, node_app], Instances),
+			pm_cluster:slaves(Instances),
+			Instances
+	end.
+
+% Get a list of the live nodes
+get_live_nodes() -> pm_master:get_current_nodes().
+% Terminate the cloud messenger
+% This sends a shutdown to the whole cloud
+shutdown() -> 
+	pm_master:shutdown_cloud().

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

@@ -0,0 +1,38 @@
+% This supervisor is responsible for monitoring the 
+% client service
+
+-module (pm_client_supervisor).
+-behaviour(supervisor).
+
+-export([start/0, start_in_shell_for_testing/0, start_link/1, init/1]).
+
+-ifdef(EUNIT).
+-include_lib("eunit/include/eunit.hrl").
+-endif.
+
+start() ->
+	spawn(fun() ->
+			supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = [])
+		end).
+
+start_in_shell_for_testing() ->
+	{ok, Pid} = supervisor:start_link({local, ?MODULE}, ?MODULE, _Arg = []),
+	unlink(Pid).
+
+start_link(Args) ->
+	supervisor:start_link({local, ?MODULE}, ?MODULE, Args).	
+
+init([]) ->
+	RestartStrategy = one_for_one,
+	MaxRestarts = 1000,
+	MaxTimeBetRestarts = 3600,
+	TimeoutTime = 5000,
+
+	SupFlags = {RestartStrategy, MaxRestarts, MaxTimeBetRestarts},
+	
+	% Servers
+	ClientServer = {client_server1,  {client_server, start, []}, permanent, TimeoutTime, worker, [client_server]},
+	
+	LoadServers = [ClientServer],
+
+	{ok, {SupFlags, LoadServers}}.

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

@@ -100,11 +100,13 @@ init([]) ->
 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) ->
+		Loads = utils:convert_responses_to_int_list(List),
+		{reply, Loads, State};		
+handle_call({get_current_load, [Type]}, _From, State) ->
 	LoadForType = get_load_for_type(Type, State),
 	?TRACE("LoadForType: ",[LoadForType]),
-	{reply, LoadForType, State};
+	Loads = utils:average_of_list(LoadForType),
+	{reply, Loads, State};
 handle_call({get_live_nodes}, _From, State) ->
 	{reply, get_live_nodes(State), State}.
 	

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

@@ -21,7 +21,7 @@
 					monitors = {}  % Tuple of monitors
 				}).
 -define(SERVER, ?MODULE).
--define (UPDATE_TIME, 2000).
+-define (UPDATE_TIME, 10000).
 
 % Client function definitions
 -export ([stop/0]).

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

@@ -52,11 +52,14 @@ gen_rel(Name, Vers) ->
 recompile_scripts(Vers) ->
 	gen_rel("master", Vers),
 	gen_rel("node", Vers),
+	gen_rel("client", Vers),
 	systools:make_script("pm_node_rel-"++Vers, [local,{path,["ebin"]}]),
-	systools:make_script("pm_master_rel-"++Vers, [local,{path,["ebin"]}]).
+	systools:make_script("pm_master_rel-"++Vers, [local,{path,["ebin"]}]),
+	systools:make_script("pm_client_rel-"++Vers, [local,{path,["ebin"]}]).
 
 package_scripts(Vers) ->
 	systools:make_tar("ebin/pm_node_rel-"++Vers),
+	systools:make_tar("ebin/pm_client_rel-"++Vers),
 	systools:make_tar("ebin/pm_master_rel-"++Vers).
 
 get_vsn(Module) ->

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

@@ -24,7 +24,7 @@ tick_timer(Time, Fun) ->
 	after Time -> 
 		Fun(), 
 		tick_timer(Time, Fun) 
-end. 
+	end. 
 
 average_of_list(L) ->
 	Sum = lists:foldr( fun(Int, Sum) -> erlang:list_to_float(Int) + Sum end, 0, [F || F <- L] ),

data/lib/poolparty/base_packages/poolparty.rb

@@ -77,7 +77,9 @@ module PoolParty
           # TODO: Update this so it only runs when needed
           has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :onlyif => "ps aux | grep beam | grep master")
           
-          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty-latest"), get_cron("puppetd runner"), get_cron("Load handler"), get_exec("start master messenger"), get_service("haproxy")]})
+          has_exec(:name => "start client server", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger"), get_exec("start master messenger")], :onlyif => "ps aux | grep beam | grep client")
+          
+          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty-latest"), get_cron("puppetd runner"), get_cron("Load handler"), get_exec("start master messenger"), get_service("haproxy"), get_exec("start client server")]})
           
           has_remotefile(:name => "/usr/bin/puppetcleaner") do
             mode 744

data/lib/poolparty/helpers/binary.rb

@@ -19,7 +19,8 @@ module PoolParty
             "#{Base.remote_storage_path}/#{Base.default_specfile_name}", 
             ENV["POOL_SPEC"],
             "#{Base.default_specfile_name}",
-            "#{Base.storage_directory}/#{Base.default_specfile_name}",            
+            "#{Base.storage_directory}/#{Base.default_specfile_name}",
+            "#{Base.default_project_specfile_name}"
         ].reject {|a| a.nil?}.reject do |f|
           f unless ::File.readable?(f)
         end.first

data/lib/poolparty/helpers/console.rb

@@ -7,12 +7,12 @@ module PoolParty
     
     # Load a file that contains a pool into memory
     def load_pool(filename)
-      filename = filename.chomp
+
       unless filename && ::File.readable?(filename)
-        puts "Could not load pool: #{filename}"
-        exit
+        puts "Please specify your cloud with -s, move it to ./pool.spec or in your POOL_SPEC environment variable"
+        exit(1)
       else
-        PoolParty::Script.inflate(open(filename).read, File.dirname(filename))
+        PoolParty::Script.inflate(open(filename).read, filename)
       end
     end
     

data/lib/poolparty/helpers/optioner.rb

@@ -46,7 +46,7 @@ module PoolParty
         opts.separator "Options:"
         
         opts.on('-v', '--verbose', 'Be verbose')    { self.verbose true }  
-        opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file }
+        opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file.chomp }
         opts.on('-t', '--test', 'Testing mode')    { self.testing true }
 
         blk.call(opts, self) if blk

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.0; end"
+        InstanceMethods.module_eval "def #{arg}; @#{arg} ||= messenger_send!(\"get_current_load #{arg}\").to_f rescue -1.0; end"
       end
     end
 

data/lib/poolparty/net/messenger.rb

@@ -6,20 +6,35 @@ module PoolParty
     Messenger.messenger_send!("reconfigure_cloud")
   end
   module Messenger
-    
+    def with_socket(testing=false, &block)
+      host = testing ? "localhost" : (master.ip)
+      socket = TCPSocket.open(host, 7050)
+      out = yield(socket)
+      socket.close
+      out
+    end
     # TODO: Fix cookie setting
-    def self.erl_command(hostname, extra="")
-      command_line_opts = "-pa #{append_dir}/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname #{hostname} -setcookie poolparty"
+    def self.erl_command(hostname, extra="", min_ports=7000, max_ports=7050)
+      command_line_opts = "-pa #{append_dir}/ebin -kernel inet_dist_listen_min #{min_ports} inet_dist_listen_max #{max_ports} -sname #{hostname} -setcookie poolparty"
       
-      "erl #{command_line_opts} #{extra} 2>&1"
+      "erl #{command_line_opts} #{extra}"
     end
     
     def self.append_dir
       ::File.expand_path(::File.join( ::File.dirname(__FILE__), "..", "..", "erlang/messenger" ))
     end
     
-    def self.messenger_send!(cmd="", testing=false)
-      command = Messenger.erl_command("client#{Time.now.to_i}", "-hidden -s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
+    def messenger_send!(msg="get_current_load cpu", testing=false)
+      with_socket(testing) do |sock|
+        sock.send(msg, 0)
+        @str = sock.recv(2000)
+      end
+      vputs "Received #{@str} from #{msg}"
+      @str
+    end
+    
+    def self.messenger_send!(cmd="", testing=false)      
+      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/pool/base.rb

@@ -22,6 +22,7 @@ module PoolParty
       :template_path => "/var/lib/puppet/templates",
       :module_path => "/etc/puppet/modules/poolparty",
       :default_specfile_name => "pool.spec",
+      :default_project_specfile_name => "spec/pool.spec",
       :port => "80",
       :forwarding_port => "8080",
       :proxy_mode => "http",      

data/lib/poolparty/pool/pool.rb

@@ -39,7 +39,8 @@ module PoolParty
       end
       
       def plugin_directory(*args)
-        args.each {|arg| Dir["#{arg}/*/*.rb"].each {|f| require f }}
+        args = ["/plugins"] if args.empty?
+        args.each {|arg| Dir["#{arg}/*/*.rb"].each {|f| require f rescue "" }}
       end
             
       # This is where the entire process starts

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 48
+    TINY  = 49
 
     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.48
+  version: 0.2.49
 platform: ruby
 authors: 
 - Ari Lerner
@@ -71,8 +71,8 @@ executables:
 - cloud-run
 - cloud-ssh
 - cloud-start
+- cloud-stats
 - cloud-terminate
-- messenger-get-load
 - pool
 - pool-console
 - pool-describe
@@ -86,6 +86,7 @@ executables:
 - server-list-responding
 - server-rerun
 - server-show-stats
+- server-start-client
 - server-start-master
 - server-start-node
 extensions: []
@@ -121,8 +122,8 @@ files:
 - bin/cloud-run
 - bin/cloud-ssh
 - bin/cloud-start
+- bin/cloud-stats
 - bin/cloud-terminate
-- bin/messenger-get-load
 - bin/pool
 - bin/pool-console
 - bin/pool-describe
@@ -136,6 +137,7 @@ files:
 - bin/server-list-responding
 - bin/server-rerun
 - bin/server-show-stats
+- bin/server-start-client
 - bin/server-start-master
 - bin/server-start-node
 - config/hoe.rb
@@ -152,6 +154,9 @@ files:
 - lib/erlang/messenger/README
 - lib/erlang/messenger/Rakefile
 - lib/erlang/messenger/control
+- lib/erlang/messenger/ebin/client.app
+- lib/erlang/messenger/ebin/client_app.beam
+- lib/erlang/messenger/ebin/client_server.beam
 - lib/erlang/messenger/ebin/erl_crash.dump
 - lib/erlang/messenger/ebin/master.app
 - lib/erlang/messenger/ebin/master_app.beam
@@ -159,6 +164,9 @@ files:
 - lib/erlang/messenger/ebin/node_app.beam
 - lib/erlang/messenger/ebin/packager.app
 - lib/erlang/messenger/ebin/pm_client.beam
+- lib/erlang/messenger/ebin/pm_client_old.beam
+- lib/erlang/messenger/ebin/pm_client_rel-0.1.rel
+- lib/erlang/messenger/ebin/pm_client_supervisor.beam
 - lib/erlang/messenger/ebin/pm_cluster.beam
 - lib/erlang/messenger/ebin/pm_event_manager.beam
 - lib/erlang/messenger/ebin/pm_master.beam
@@ -227,13 +235,20 @@ files:
 - 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/log/pool.logs
+- lib/erlang/messenger/pm_client_rel-0.1.boot
+- lib/erlang/messenger/pm_client_rel-0.1.script
 - lib/erlang/messenger/pm_master_rel-0.1.boot
 - lib/erlang/messenger/pm_master_rel-0.1.script
 - lib/erlang/messenger/pm_node_rel-0.1.boot
 - lib/erlang/messenger/pm_node_rel-0.1.script
+- lib/erlang/messenger/src/client_app.erl
+- lib/erlang/messenger/src/client_server.erl
 - lib/erlang/messenger/src/master_app.erl
 - lib/erlang/messenger/src/node_app.erl
 - lib/erlang/messenger/src/pm_client.erl
+- lib/erlang/messenger/src/pm_client_old.erl
+- lib/erlang/messenger/src/pm_client_supervisor.erl
 - lib/erlang/messenger/src/pm_cluster.erl
 - lib/erlang/messenger/src/pm_event_manager.erl
 - lib/erlang/messenger/src/pm_master.erl

data/spec/poolparty/bin/console_spec.rb

@@ -56,6 +56,24 @@ describe "Console" do
       reload!
     end
   end
+  describe "pools" do
+    before(:each) do
+      @filename = "myspec.spec"
+      ::File.stub!(:readable?).with(@filename).and_return true
+      @filename.stub!(:read).and_return "spec contents"
+      self.stub!(:open).with(@filename).and_return @filename
+    end
+    it "should call readable on the string sent in to load_pool" do      
+      lambda {
+        ::File.should_receive(:readable?).with(@filename).and_return false
+        load_pool(@filename)
+      }
+    end
+    it "should call inflate from Script with the poolspec" do
+      PoolParty::Script.should_receive(:inflate).with("spec contents", "myspec.spec")
+      load_pool(@filename)
+    end
+  end
   describe "print" do
     before(:each) do
       reset!

data/spec/poolparty/monitors/base_monitor_spec.rb

@@ -9,6 +9,9 @@ class TestMonitorClass
 end
 
 describe "Monitors" do
+  before(:each) do
+    @tmc = TestMonitorClass.new
+  end
   it "should have a list of available monitors" do
     PoolParty::Monitors.available_monitors.empty?.should == false
   end
@@ -22,12 +25,12 @@ describe "Monitors" do
     TestMonitorClass.new.respond_to?(:fake).should == true
   end
   it "should call the Messenger with messenger_send!('get_load fake')" do
-    PoolParty::Messenger.should_receive(:messenger_send!).with("get_load fake").and_return true
-    TestMonitorClass.new.fake
+    @tmc.should_receive(:messenger_send!).with("get_current_load fake").and_return true
+    @tmc.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
+    @tmc.should_receive(:messenger_send!).with("get_current_load cpu").and_return true
+    @tmc.cpu
   end
   describe "expansions" do
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.48
+  version: 0.2.49
 platform: ruby
 authors: 
 - Ari Lerner
@@ -71,8 +71,8 @@ executables:
 - cloud-run
 - cloud-ssh
 - cloud-start
+- cloud-stats
 - cloud-terminate
-- messenger-get-load
 - pool
 - pool-console
 - pool-describe
@@ -86,6 +86,7 @@ executables:
 - server-list-responding
 - server-rerun
 - server-show-stats
+- server-start-client
 - server-start-master
 - server-start-node
 extensions: []
@@ -121,8 +122,8 @@ files:
 - bin/cloud-run
 - bin/cloud-ssh
 - bin/cloud-start
+- bin/cloud-stats
 - bin/cloud-terminate
-- bin/messenger-get-load
 - bin/pool
 - bin/pool-console
 - bin/pool-describe
@@ -136,6 +137,7 @@ files:
 - bin/server-list-responding
 - bin/server-rerun
 - bin/server-show-stats
+- bin/server-start-client
 - bin/server-start-master
 - bin/server-start-node
 - config/hoe.rb
@@ -152,6 +154,9 @@ files:
 - lib/erlang/messenger/README
 - lib/erlang/messenger/Rakefile
 - lib/erlang/messenger/control
+- lib/erlang/messenger/ebin/client.app
+- lib/erlang/messenger/ebin/client_app.beam
+- lib/erlang/messenger/ebin/client_server.beam
 - lib/erlang/messenger/ebin/erl_crash.dump
 - lib/erlang/messenger/ebin/master.app
 - lib/erlang/messenger/ebin/master_app.beam
@@ -159,6 +164,9 @@ files:
 - lib/erlang/messenger/ebin/node_app.beam
 - lib/erlang/messenger/ebin/packager.app
 - lib/erlang/messenger/ebin/pm_client.beam
+- lib/erlang/messenger/ebin/pm_client_old.beam
+- lib/erlang/messenger/ebin/pm_client_rel-0.1.rel
+- lib/erlang/messenger/ebin/pm_client_supervisor.beam
 - lib/erlang/messenger/ebin/pm_cluster.beam
 - lib/erlang/messenger/ebin/pm_event_manager.beam
 - lib/erlang/messenger/ebin/pm_master.beam
@@ -227,13 +235,20 @@ files:
 - 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/log/pool.logs
+- lib/erlang/messenger/pm_client_rel-0.1.boot
+- lib/erlang/messenger/pm_client_rel-0.1.script
 - lib/erlang/messenger/pm_master_rel-0.1.boot
 - lib/erlang/messenger/pm_master_rel-0.1.script
 - lib/erlang/messenger/pm_node_rel-0.1.boot
 - lib/erlang/messenger/pm_node_rel-0.1.script
+- lib/erlang/messenger/src/client_app.erl
+- lib/erlang/messenger/src/client_server.erl
 - lib/erlang/messenger/src/master_app.erl
 - lib/erlang/messenger/src/node_app.erl
 - lib/erlang/messenger/src/pm_client.erl
+- lib/erlang/messenger/src/pm_client_old.erl
+- lib/erlang/messenger/src/pm_client_supervisor.erl
 - lib/erlang/messenger/src/pm_cluster.erl
 - lib/erlang/messenger/src/pm_event_manager.erl
 - lib/erlang/messenger/src/pm_master.erl

data/bin/messenger-get-load

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-$:.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', 'Listing for cloud name')    { |c| optioner.cloudname c }
-  opts.on('-m name', '--monitor monitor_name', "Monitor name (default: cpu) (Available monitors: #{available_monitors.join(", ")})") {|c| optioner.monitorname c}
-end
-
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = extract_cloud_from_options o
-@monitor = o.monitorname || "cpu"
-
-@clouds.each do |cl|
-  
-  with_cloud(cl, {:testing => o.testing, :monitorname => @monitor, :verbose => o.verbose }) do
-    vputs "Getting #{monitorname} load through the messenger"
-    load = PoolParty::Messenger.messenger_send!("get_load #{monitorname}", testing)
-    msg = load =~ /[0-9\.]+/ ? load : "-1"
-    print msg
-  end
-  
-end