auser-poolparty 0.2.15 → 0.2.16

data/Manifest.txt

@@ -14,6 +14,7 @@ bin/cloud-maintain
 bin/cloud-osxcopy
 bin/cloud-provision
 bin/cloud-refresh
+bin/cloud-run
 bin/cloud-ssh
 bin/cloud-start
 bin/cloud-terminate
@@ -24,10 +25,12 @@ bin/pool-list
 bin/pool-provision
 bin/pool-spec
 bin/pool-start
-bin/pool-start-monitor
+bin/server-fire-cmd
 bin/server-get-load
 bin/server-list-active
 bin/server-rerun
+bin/server-start-master
+bin/server-start-node
 config/hoe.rb
 config/requirements.rb
 examples/basic.rb
@@ -41,25 +44,40 @@ 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/load_app.beam
+lib/erlang/messenger/ebin/master.app
+lib/erlang/messenger/ebin/master_app.beam
+lib/erlang/messenger/ebin/node.app
+lib/erlang/messenger/ebin/node_app.beam
+lib/erlang/messenger/ebin/pm_client.beam
 lib/erlang/messenger/ebin/pm_cluster.beam
+lib/erlang/messenger/ebin/pm_event_handler.beam
 lib/erlang/messenger/ebin/pm_master.beam
+lib/erlang/messenger/ebin/pm_master_rel-0.1.rel
 lib/erlang/messenger/ebin/pm_master_supervisor.beam
 lib/erlang/messenger/ebin/pm_node.beam
+lib/erlang/messenger/ebin/pm_node_rel-0.1.rel
 lib/erlang/messenger/ebin/pm_node_supervisor.beam
-lib/erlang/messenger/ebin/tmp/templates/apache2.conf
-lib/erlang/messenger/ebin/tmp/templates/base.conf.erb
-lib/erlang/messenger/ebin/tmp/templates/browser_fixes.conf.erb
-lib/erlang/messenger/ebin/tmp/templates/mime-minimal.conf.erb
-lib/erlang/messenger/ebin/tmp/templates/virtual_host.conf.erb
-lib/erlang/messenger/lib/load_app.app
-lib/erlang/messenger/src/load_app.erl
+lib/erlang/messenger/ebin/utils.beam
+lib/erlang/messenger/logs/pool_log.log
+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/master_app.erl
+lib/erlang/messenger/src/node_app.erl
+lib/erlang/messenger/src/pm_client.erl
 lib/erlang/messenger/src/pm_cluster.erl
+lib/erlang/messenger/src/pm_event_handler.erl
 lib/erlang/messenger/src/pm_master.erl
 lib/erlang/messenger/src/pm_master_supervisor.erl
 lib/erlang/messenger/src/pm_node.erl
 lib/erlang/messenger/src/pm_node_supervisor.erl
+lib/erlang/messenger/src/utils.erl
+lib/erlang/messenger/tmp/templates/apache2.conf
+lib/erlang/messenger/tmp/templates/base.conf.erb
+lib/erlang/messenger/tmp/templates/browser_fixes.conf.erb
+lib/erlang/messenger/tmp/templates/mime-minimal.conf.erb
+lib/erlang/messenger/tmp/templates/virtual_host.conf.erb
 lib/poolparty.rb
 lib/poolparty/base_packages/haproxy.rb
 lib/poolparty/base_packages/heartbeat.rb

data/bin/cloud

@@ -30,11 +30,11 @@ end
 program_name = "#{File.basename($0)}-#{name}"
 program_location = File.join(Binary.binary_directory, program_name)
 
-command_line = "#{program_location} #{ARGV.join(" ")}"
+command_line = "#{program_location}"
 
 # Run it from the command-line first
 if Binary.available_binaries_for("cloud").include?(name)
-  exec "#{command_line}"
+  system command_line, *ARGV
 else
   puts "Unknown poolparty binary: #{program_name}"
 end

data/bin/cloud-provision

@@ -3,7 +3,7 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-c [master|slaves|all]', '--class [master|slaves|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
+  opts.on('-c [master|slaves|all]', '--class [master|slave|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
 

data/bin/cloud-run

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+@cmd = ARGV[-1]
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)')    { |i| optioner.num i }
+  opts.on('-c command', '--command command', 'Command to run on the instance')    { |c| optioner.command c }
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+@cmd = o.command if (o.command)
+@cloud = o.cloudname ? cloud(o.cloudname.downcase.to_sym) : cloud(clouds.keys.first)
+
+instance = @cloud.run_command_on_instance_number( @cmd, o.num.to_i || 0 ) if @cloud

data/bin/pool

@@ -21,11 +21,11 @@ end
 program_name = "#{File.basename($0)}-#{name}"
 program_location = File.join(Binary.binary_directory, program_name)
 
-command_line = "#{program_location} #{ARGV.join(" ")}"
+command_line = "#{program_location}"
 
 # Run it from the command-line first
 if Binary.available_binaries_for("pool").include?(name)
-  Kernel.exec "#{command_line}"
+  system command_line, *ARGV
 else
   puts "Unknown poolparty binary: #{program_name}"
 end

data/bin/server-fire-cmd

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+@command = ARGV[-1] || ""
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-c command', '--command command', 'Command to run')    { |c| optioner.command c }
+end
+
+@command = o.command if o.command
+
+# TODO: Add a whitelist of commands the 
+# server can run for SECURITY    
+puts %x[#{@command}].chomp

data/bin/server-start-master

@@ -0,0 +1,32 @@
+#!/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', 'Host name')    { |h| optioner.hostname h }
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+include Remote
+
+@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@hostname = o.hostname ? o.hostname : "master"
+
+@clouds.each do |name, cloud|
+  
+  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname }) do
+    # TODO: Change this to be app specfic
+    # SECURITY RISK
+    append_dir = ::File.join( ::File.dirname(__FILE__), "..", "lib/erlang/messenger" )
+    command_line_opts = "-pa #{append_dir}/ebin -sname #{hostname} -setcookie poolparty -detached -heart"
+    boot_file = "#{append_dir}/pm_master_rel-0.1"
+    
+    command = "erl -boot #{boot_file} #{command_line_opts}"
+    
+    Kernel.system command
+  end  
+  
+end

data/bin/server-start-node

@@ -0,0 +1,32 @@
+#!/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', 'Host name')    { |h| optioner.hostname h }
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+include Remote
+
+@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@hostname = o.hostname ? o.hostname : "master"
+
+@clouds.each do |name, cloud|
+  
+  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname }) do
+    # TODO: Change this to be app specfic
+    # SECURITY RISK
+    append_dir = ::File.join( ::File.dirname(__FILE__), "..", "lib/erlang/messenger" )
+    command_line_opts = "-pa #{append_dir}/ebin -sname #{hostname} -setcookie poolparty -detached -heart"
+    boot_file = "#{append_dir}/pm_node_rel-0.1"
+    
+    command = "erl -boot #{boot_file} #{command_line_opts}"
+    
+    Kernel.system command
+  end  
+  
+end

data/lib/erlang/messenger/Rakefile

@@ -15,8 +15,20 @@ rule ".beam" => ["%{ebin,src}X.erl"] do |t|
   sh "erlc -D EUNIT -pa ebin -W #{ERLC_FLAGS} -o ebin #{t.source}"
 end
 
+desc "Recompile the sources"
+task :recompile => [:clean, :compile]
+
+desc "Compile all the sources"
 task :compile => ['ebin'] + OBJ
 
+desc "Rebuild the boot scripts"
+task :build_boot_scripts => [:recompile] do
+  puts "Rebuilding boot scripts"
+  @version = "0.1"
+  cmd = "erl -pa ./ebin/ -run utils recompile_scripts #{@version} -run init stop -noshell"
+  Kernel.system cmd
+end
+
 task :default => :compile
 
 task :test => [:compile] do

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

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

data/lib/erlang/messenger/{lib/load_app.app → ebin/node.app}

@@ -1,18 +1,19 @@
-{application, load_app,
+{application, node,
   [
 		% Quick description of the server
-		{description, "Load Server"},
+		{description, "Node Server for PoolParty"},
 		% Version
 		{vsn, "0.1"},
 		% All modules used by the application.  
-		{modules, [load_supervisor, load_server, load_app, load_client]},
+		{modules, [node_app, pm_node, pm_node_supervisor, utils]},
 		% All the registered names in the application
-		{registered, [load_server]},
+		{registered, [pm_node, pm_node_supervisor]},
 		% These must be started for application to run
 		{applications, [kernel, stdlib]},
 		% Environment vars
 		{env, []},
 		% Module and Args used to start
-		{mod, {load_app, []}}
+		{mod, {node_app, []}},
+		{start_phases, []}
 	]
 }.

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

@@ -0,0 +1,7 @@
+{release, {"pm_master_rel", "0.1"},
+          {erts, "5.6.3"},
+          [{kernel, "2.12.2"},
+           {stdlib, "1.15.2"},
+           {sasl, "2.1.5.2"},
+           {master, "0.1"}]
+}.

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

@@ -0,0 +1,7 @@
+{release, {"pm_node_rel", "0.1"},
+          {erts, "5.6.3"},
+          [{kernel, "2.12.2"},
+           {stdlib, "1.15.2"},
+           {sasl, "2.1.5.2"},
+           {node, "0.1"}]
+}.

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

@@ -0,0 +1,169 @@
+%% script generated at {2008,10,23} {2,11,55}
+{script,
+    {"pm_master_rel","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/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_master_supervisor,pm_master,master_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/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,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,master,
+                  [{description,"Master Server for PoolParty"},
+                   {vsn,"0.1"},
+                   {id,[]},
+                   {modules,[master_app,pm_master,pm_master_supervisor,utils]},
+                   {registered,[pm_master,pm_master_supervisor]},
+                   {applications,[kernel,stdlib]},
+                   {included_applications,[]},
+                   {env,[]},
+                   {start_phases,[]},
+                   {maxT,infinity},
+                   {maxP,infinity},
+                   {mod,{master_app,[]}}]}]}},
+     {progress,applications_loaded},
+     {apply,{application,start_boot,[kernel,permanent]}},
+     {apply,{application,start_boot,[stdlib,permanent]}},
+     {apply,{application,start_boot,[sasl,permanent]}},
+     {apply,{application,start_boot,[master,permanent]}},
+     {apply,{c,erlangrc,[]}},
+     {progress,started}]}.