auser-poolparty 0.2.26 → 0.2.35

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

@@ -0,0 +1,16 @@
+% Includes file for the PoolParty Messenger
+
+-ifdef(debug).
+
+-define (MASTER_LOCATION, erlang:list_to_atom(lists:append("master@", element(2, inet:gethostname()))) ).
+-define (TRACE(X, M), io:format("TRACE ~p:~p ~p ~p~n" ,[?MODULE, ?LINE, X, M])).
+
+-else.
+
+-define (MASTER_LOCATION, master@master).
+-define (TRACE(X, M), void).
+
+-endif.
+
+-define (MASTER_NODE_NAME, master).
+-define (MASTER_SERVER, global:whereis_name(pm_master)).

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

@@ -1,19 +1,47 @@
 -module (pm_client).
--export ([init/0, send_cmd/1, reconfigure_cloud/0, get_load/1, get_live_nodes/0]).
+-include_lib("../include/defines.hrl").
+-define (SERVER, global:whereis_name(?MODULE)).
+
+-export ([init_conn/0, send_cmd/1, reconfigure_cloud/0, get_load/1, get_live_nodes/0]).
+-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
-init() -> net_adm:ping(master@master).
+init_conn() -> net_adm:ping(?MASTER_LOCATION).
 % Send the command Cmd to the pm_master process
-send_cmd(Cmd) ->	pm_master:fire_cmd(Cmd).
+send_cmd(Cmd) ->	
+	init_conn(),
+	pm_master:fire_cmd(Cmd).
 % Reconfigure the cloud
-reconfigure_cloud() -> pm_master:reconfigure_cloud().
+reconfigure_cloud() -> 
+	init_conn(),
+	pm_master:reconfigure_cloud().
 % Get the load on the cloud of type Type
-get_load(Type) -> pm_master:get_load(Type).
+get_load(Type) -> 
+	init_conn(),
+	pm_master:get_load(Type).
+% 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_live_nodes().
+get_live_nodes() -> 
+	init_conn(),
+	pm_cluster:get_live_nodes().
 % Terminate the cloud messenger
 % This sends a shutdown to the whole cloud
-shutdown() -> pm_master:shutdown_cloud().
+shutdown() -> 
+	init_conn(),
+	pm_master:shutdown_cloud().

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

@@ -4,10 +4,15 @@
 -include_lib("eunit/include/eunit.hrl").
 -endif.
 
+-include_lib("../include/defines.hrl").
+
 -export ([slaves/1, slaves/0]).
--export ([get_live_nodes/0,refresh_live_nodes/0]).
+-export ([get_live_nodes/0]).
 -export ([send_call/2, master/0]).
 
+-export ([any_new_servers/0]).
+
+% gen_server:call(?MASTER_SERVER, {Type, Args}).
 send_call(Type, Args) ->
 	Nodes = get_live_nodes(),
 	rpc:multicall(Nodes, pm_node, Type, [Args]).
@@ -20,7 +25,7 @@ slaves([]) ->
 
 slaves([Host|Hosts]) ->
 	Args = erl_system_args(),
-	NodeName = "pp_cluster",
+	NodeName = "pp",
 	{ok, Node} = slave:start_link(Host, NodeName, Args),
 	io:format("Erlang node started = [~p]~n", [Node]),
 	slaves(Hosts).
@@ -39,17 +44,15 @@ erl_system_args()->
 		Shared, " +Mea r10b "
 	]).
 
-refresh_live_nodes() ->
+any_new_servers() ->
 	String = ". /etc/profile && server-list-active -c name",
-	Nodes = string:tokens(os:cmd(String), "\n\t"),
-	io:format("nodes: ~p~n", [Nodes]),
-	lists:map(
-		fun(No) ->
-			io:format("pinging ~p~n", [list_to_atom(lists:append("pp_cluster@",No))]),
-			net_adm:ping(list_to_atom(lists:append("@pp_cluster", No)))
-		end,
-		Nodes),
-	ok.
+	Nodes = lists:map(fun
+		(No) ->
+			erlang:list_to_atom(lists:append([No, "@", No]))
+	end,string:tokens(os:cmd(String), "\n\t")),
+	NewServers = Nodes -- get_live_nodes(),
+	NewServers.
+	
 % Get the live nodes
 get_live_nodes() ->
 	nodes().

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

@@ -0,0 +1,27 @@
+-module (pm_event_manager).
+-include_lib("../include/defines.hrl").
+
+%% API
+-export([start_link/0, add_handler/1, notify/1]).
+-define(SERVER, ?MODULE).
+
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | {error,Error}
+%% Description: Creates an event manager.
+%%--------------------------------------------------------------------
+start_link() ->
+  gen_event:start_link({local, ?SERVER}).
+
+%%--------------------------------------------------------------------
+%% Function: add_handler(Module) -> ok | {'EXIT',Reason} | term()
+%% Description: Adds an event handler
+%%--------------------------------------------------------------------
+add_handler(Module) ->
+  gen_event:add_handler(?SERVER, Module, []).
+
+%%--------------------------------------------------------------------
+%% Function: notify(Event) -> ok | {error, Reason}
+%% Description: Sends the Event through the event manager.
+%%--------------------------------------------------------------------
+notify(Event) ->
+  gen_event:notify(?SERVER, Event).

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

@@ -8,28 +8,58 @@
 -module(pm_master).
 -behaviour(gen_server).
 
+-include_lib("../include/defines.hrl").
+
+-record(state, {}).
+-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]).
--record(state, {}).
--define(SERVER, ?MODULE).
 
 % Client function definitions
--export ([get_load/1, reconfigure_cloud/0, fire_cmd/1]).
+-export ([get_load/1, reconfigure_cloud/0, get_live_nodes/0]).
+-export ([run_cmd/1, fire_cmd/1]).
 -export ([shutdown_cloud/0]).
 
 %%====================================================================
 %% API
 %%====================================================================
 %%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+% pm_master:get_load("0", "cpu").
+get_load(Type) ->
+	% {Loads, _} = pm_cluster:send_call(get_load_for_type, [Type]),
+	{Loads, _} = gen_server:call(?SERVER, {get_load_for_type, [Type]}),
+	io:format("Loads: ~p~n", [Loads]),
+	utils:convert_responses_to_int_list(Loads).
+
+% Send reconfigure tasks to every node
+reconfigure_cloud() ->
+	gen_server:call(?SERVER, {run_reconfig}).
+
+% Fire the given command on all nodes
+run_cmd(Cmd) -> gen_server:call(?SERVER, {run_cmd, Cmd}).
+fire_cmd(Cmd) -> gen_server:call(?SERVER, {fire_cmd, Cmd}).
+
+get_live_nodes() ->
+	nodes().
+	
+% Shutdown
+shutdown_cloud() ->
+	pm_cluster:send_call(stop, []),
+	{ok}.
+%%--------------------------------------------------------------------
 %% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
 %% Description: Starts the server
 %%--------------------------------------------------------------------
 start_link() ->
-  gen_server:start_link({global, ?SERVER}, ?MODULE, [], []).
+  gen_server:start_link({global, ?MODULE}, ?MODULE, [], []).
 
 %%====================================================================
 %% gen_server callbacks
@@ -43,6 +73,7 @@ start_link() ->
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
 init([]) ->
+	% pm_event_manager:add_handler(pm_master_event_handler),
   {ok, #state{}}.
 
 %%--------------------------------------------------------------------
@@ -54,9 +85,14 @@ init([]) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
-handle_call(_Request, _From, State) ->
-  Reply = ok,
-  {reply, Reply, State}.
+% Handle load messages
+handle_call({Type, Args}, _From, _State) ->
+	io:format("Calling ~p with ~p on slaves~n", [Type, Args]),
+	List = rpc:multicall(get_live_nodes(), pm_node, Type, [Args]),
+	{reply, List, nostate};
+handle_call(Request, _From, State) ->
+	Reply = Reply = rpc:multicall(get_live_nodes(), pm_node, Request, []),
+	{reply, Reply, State}.
 
 %%--------------------------------------------------------------------
 %% Function: handle_cast(Msg, State) -> {noreply, State} |
@@ -91,28 +127,4 @@ terminate(_Reason, _State) ->
 %% Description: Convert process state when code is changed
 %%--------------------------------------------------------------------
 code_change(_OldVsn, State, _Extra) ->
-  {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-
-% pm_master:get_load("0", "cpu").
-get_load(Type) ->
-	{Loads, _} = pm_cluster:send_call(get_load_for_type, [Type]),
-	{utils:convert_responses_to_int_list(Loads)}.
-
-% Send reconfigure tasks to every node
-reconfigure_cloud() ->
-	pm_cluster:send_call(run_reconfig, []),
-	{ok}.
-
-% Fire the given command on all nodes
-fire_cmd(Cmd) ->
-	pm_cluster:send_call(fire_cmd, [Cmd]),
-	{ok}.
-
-% Shutdown
-shutdown_cloud() ->
-	pm_cluster:send_call(stop, []),
-	{ok}.
+  {ok, State}.

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

@@ -0,0 +1,72 @@
+-module (pm_master_event_handler).
+-behaviour(gen_event).
+-include_lib("../include/defines.hrl").
+
+%% gen_event callbacks
+-export([init/1, handle_event/2, handle_call/2,
+         handle_info/2, terminate/2, code_change/3]).
+
+%%====================================================================
+%% gen_event callbacks
+%%====================================================================
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State}
+%% Description: Whenever a new event handler is added to an event manager,
+%% this function is called to initialize the event handler.
+%%--------------------------------------------------------------------
+init([]) ->
+  {ok, []}.
+
+%%--------------------------------------------------------------------
+%% Function:
+%% handle_event(Event, State) -> {ok, State} |
+%%                               {swap_handler, Args1, State1, Mod2, Args2} |
+%%                               remove_handler
+%% Description:Whenever an event manager receives an event sent using
+%% gen_event:notify/2 or gen_event:sync_notify/2, this function is called for
+%% each installed event handler to handle the event.
+%%--------------------------------------------------------------------
+handle_event(_Event, State) ->
+  {ok, State}.
+
+%%--------------------------------------------------------------------
+%% Function:
+%% handle_call(Request, State) -> {ok, Reply, State} |
+%%                                {swap_handler, Reply, Args1, State1,
+%%                                  Mod2, Args2} |
+%%                                {remove_handler, Reply}
+%% Description: Whenever an event manager receives a request sent using
+%% gen_event:call/3,4, this function is called for the specified event
+%% handler to handle the request.
+%%--------------------------------------------------------------------
+handle_call(_Request, State) ->
+  Reply = ok,
+  {ok, Reply, State}.
+
+%%--------------------------------------------------------------------
+%% Function:
+%% handle_info(Info, State) -> {ok, State} |
+%%                             {swap_handler, Args1, State1, Mod2, Args2} |
+%%                              remove_handler
+%% Description: This function is called for each installed event handler when
+%% an event manager receives any other message than an event or a synchronous
+%% request (or a system message).
+%%--------------------------------------------------------------------
+handle_info(_Info, State) ->
+  {ok, State}.
+
+%%--------------------------------------------------------------------
+%% Function: terminate(Reason, State) -> void()
+%% Description:Whenever an event handler is deleted from an event manager,
+%% this function is called. It should be the opposite of Module:init/1 and
+%% do any necessary cleaning up.
+%%--------------------------------------------------------------------
+terminate(_Reason, _State) ->
+  ok.
+
+%%--------------------------------------------------------------------
+%% Function: code_change(OldVsn, State, Extra) -> {ok, NewState}
+%% Description: Convert process state when code is changed
+%%--------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+  {ok, State}.

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

@@ -24,17 +24,16 @@ start_link(Args) ->
 
 init([]) ->
 	RestartStrategy = one_for_one,
-	MaxRestarts = 3, % 1000
-	MaxTimeBetRestarts = 30, % 3600
+	MaxRestarts = 1000,
+	MaxTimeBetRestarts = 3600,
+	TimeoutTime = 5000,
 
 	SupFlags = {RestartStrategy, MaxRestarts, MaxTimeBetRestarts},
-
-	LoadServers = [
-		{pm_master1, 
-			{pm_master, start_link, []}, 
-			permanent, 5000, worker, 
-			[pm_master]
-		}
-	],
+	
+	% Servers
+	EventManager = {pm_event_manager,  {pm_event_manager, start_link, []}, permanent, TimeoutTime, worker, dynamic},
+	MasterServer = {pm_master1,  {pm_master, start_link, []}, permanent, TimeoutTime, worker, [pm_master]},	
+	
+	LoadServers = [EventManager,MasterServer],
 
 	{ok, {SupFlags, LoadServers}}.

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

@@ -8,22 +8,48 @@
 -module(pm_node).
 -behaviour(gen_server).
 
+-include_lib("../include/defines.hrl").
+
 %% 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]).
+
 -record(state, {}).
 -define(SERVER, ?MODULE).
 
 % Client function definitions
 -export ([stop/0]).
--export ([get_load_for_type/1, fire_cmd/1, run_reconfig/0]).
+-export ([get_load_for_type/1, run_cmd/1, fire_cmd/1]).
+-export ([run_reconfig/0]).
 
 %%====================================================================
 %% API
 %%====================================================================
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+
+% Get the load for the type sent...
+get_load_for_type(Type) ->
+	String = string:concat(". /etc/profile && server-get-load -m ",Type),
+	{os:cmd(String)}.
+
+% Rerun the configuration
+run_reconfig() ->
+	gen_server:cast(?MODULE, reconfig).
+
+% Allows us to fire off any command (allowed by poolparty on the check)
+run_cmd(Cmd) -> gen_server:call(?MODULE, {run_command, Cmd}).
+fire_cmd(Cmd) -> gen_server:cast(?MODULE, {fire_command, Cmd}).
+
+% Stop the pm_node entirely
+stop() ->
+	gen_server:cast(?MODULE, stop).
+	
 %%--------------------------------------------------------------------
 %% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
 %% Description: Starts the server
@@ -34,8 +60,9 @@
 %% Fires a ping every 10 seconds
 %%--------------------------------------------------------------------
 start_link() ->
-	utils:start_timer(10000, fun() -> net_adm:ping(master) end),
-  gen_server:start_link({global, ?SERVER}, ?MODULE, [], []).
+	io:format("Pinging master at ~p~n", [?MASTER_LOCATION]),
+	utils:start_timer(10000, fun() -> net_adm:ping(?MASTER_LOCATION) end),
+  gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
 %%====================================================================
 %% gen_server callbacks
@@ -61,6 +88,9 @@ init([]) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
+handle_call({run_command, Cmd}, _From, State) ->
+	Reply = os:cmd(". /etc/profile && server-fire-cmd \""++Cmd++"\""),
+	{reply, Reply, State};
 handle_call(_Request, _From, State) ->
   Reply = ok,
   {reply, Reply, State}.
@@ -71,8 +101,19 @@ handle_call(_Request, _From, State) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
-handle_cast(_Msg, State) ->
-  {noreply, State}.
+handle_cast({Msg, Cmd}, State) ->
+	case Msg of
+		reconfig ->
+			io:format("Running reconfig~n"),
+			os:cmd(". /etc/profile && server-rerun"),
+			{ok};
+		fire_command ->
+			io:format("Running command: ~p~n", [Cmd]),
+			os:cmd(". /etc/profile && server-fire-cmd \""++Cmd++"\" 2>&1 > /dev/null"),
+			{ok};
+		_ ->
+			{ok, State}
+	end.
 
 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -100,25 +141,4 @@ terminate(_Reason, _State) ->
 %% Description: Convert process state when code is changed
 %%--------------------------------------------------------------------
 code_change(_OldVsn, State, _Extra) ->
-  {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-
-% Get the load for the type sent...
-get_load_for_type(Type) ->
-	String = string:concat(". /etc/profile && server-get-load -m ",Type),
-	{os:cmd(String)}.
-
-% Rerun the configuration
-run_reconfig() ->	{os:cmd(". /etc/profile && server-rerun")}.
-
-% Allows us to fire off any command (allowed by poolparty on the check)
-fire_cmd(Cmd) ->
-	String = ". /etc/profile && server-fire-cmd \""++Cmd++"\"",
-	{os:cmd(String)}.
-
-% Stop the pm_node entirely
-stop() ->
-	gen_server:cast(?MODULE, stop).
+  {ok, State}.