auser-poolparty 0.2.55 → 0.2.56
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/cloud-refresh +1 -4
 - data/lib/erlang/messenger/include/defines.hrl +1 -1
 - data/lib/erlang/messenger/pm_client_rel-0.1.script +1 -1
 - data/lib/erlang/messenger/pm_master_rel-0.1.script +1 -1
 - data/lib/erlang/messenger/pm_node_rel-0.1.script +1 -1
 - data/lib/erlang/messenger/src/client_server.erl +9 -6
 - data/lib/poolparty/net/messenger.rb +8 -2
 - data/lib/poolparty/version.rb +1 -1
 - data/poolparty.gemspec +1 -1
 - metadata +1 -1
 
    
        data/bin/cloud-refresh
    CHANGED
    
    
| 
         @@ -4,6 +4,7 @@ 
     | 
|
| 
       4 
4 
     | 
    
         
             
            -export ([start/0]).
         
     | 
| 
       5 
5 
     | 
    
         | 
| 
       6 
6 
     | 
    
         
             
            -define (RECONNECT_TIMEOUT, 10000).
         
     | 
| 
      
 7 
     | 
    
         
            +
            -define (CAST_MESSAGES, [force_reconfig]).
         
     | 
| 
       7 
8 
     | 
    
         | 
| 
       8 
9 
     | 
    
         
             
            start() -> 	
         
     | 
| 
       9 
10 
     | 
    
         
             
            	utils:start_timer(client_timer, ?UPDATE_TIME, fun() -> client_server:connect_to_master() end),
         
     | 
| 
         @@ -14,14 +15,16 @@ master_server() -> global:whereis_name(pm_master). 
     | 
|
| 
       14 
15 
     | 
    
         
             
            loop(Socket) ->
         
     | 
| 
       15 
16 
     | 
    
         
             
                case gen_tcp:recv(Socket, 0) of
         
     | 
| 
       16 
17 
     | 
    
         
             
                    {ok, Data} ->						
         
     | 
| 
       17 
     | 
    
         
            -
            						?TRACE("received", [master_server(), erlang:binary_to_list(Data)]),
         
     | 
| 
       18 
18 
     | 
    
         
             
            						% Args = [Item || K <- string:tokens(erlang:binary_to_list(Data), " "), Item <- erlang:list_to_atom(K)],
         
     | 
| 
       19 
19 
     | 
    
         
             
            						[Meth|Args] = string:tokens(erlang:binary_to_list(Data), " "),
         
     | 
| 
       20 
     | 
    
         
            -
            						 
     | 
| 
       21 
     | 
    
         
            -
             
     | 
| 
       22 
     | 
    
         
            -
             
     | 
| 
       23 
     | 
    
         
            -
             
     | 
| 
       24 
     | 
    
         
            -
             
     | 
| 
      
 20 
     | 
    
         
            +
            						case lists:member(erlang:list_to_atom(Meth), ?CAST_MESSAGES) of
         
     | 
| 
      
 21 
     | 
    
         
            +
            							true ->
         
     | 
| 
      
 22 
     | 
    
         
            +
            								?TRACE("Received cast message", [Meth]);
         
     | 
| 
      
 23 
     | 
    
         
            +
            							_ ->
         
     | 
| 
      
 24 
     | 
    
         
            +
            								Output = gen_server:call(master_server(), {erlang:list_to_atom(Meth), Args}),
         
     | 
| 
      
 25 
     | 
    
         
            +
            								send_back_appropriate_response(Socket, Output),
         
     | 
| 
      
 26 
     | 
    
         
            +
            								?TRACE("posted", [Output])
         
     | 
| 
      
 27 
     | 
    
         
            +
            						end,
         
     | 
| 
       25 
28 
     | 
    
         
             
                        loop(Socket);
         
     | 
| 
       26 
29 
     | 
    
         
             
                    {error, closed} ->
         
     | 
| 
       27 
30 
     | 
    
         
             
                        ok
         
     | 
| 
         @@ -30,6 +30,12 @@ module PoolParty 
     | 
|
| 
       30 
30 
     | 
    
         
             
                  @str
         
     | 
| 
       31 
31 
     | 
    
         
             
                end
         
     | 
| 
       32 
32 
     | 
    
         | 
| 
      
 33 
     | 
    
         
            +
                def messenger_cast!(msg="force_reconfig")
         
     | 
| 
      
 34 
     | 
    
         
            +
                  with_socket do |sock|
         
     | 
| 
      
 35 
     | 
    
         
            +
                    sock.send(msg, 0)
         
     | 
| 
      
 36 
     | 
    
         
            +
                  end
         
     | 
| 
      
 37 
     | 
    
         
            +
                end
         
     | 
| 
      
 38 
     | 
    
         
            +
                
         
     | 
| 
       33 
39 
     | 
    
         
             
                def self.messenger_send!(cmd="", testing=false)      
         
     | 
| 
       34 
40 
     | 
    
         
             
                  command = Messenger.erl_command("client#{Time.now.to_i}", "-s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
         
     | 
| 
       35 
41 
     | 
    
         
             
                  testing ? command : %x[#{command}]
         
     | 
| 
         @@ -54,8 +60,8 @@ module PoolParty 
     | 
|
| 
       54 
60 
     | 
    
         
             
                    nodes.split(" ").map {|a| a.split(/@/)[-1] }
         
     | 
| 
       55 
61 
     | 
    
         
             
                  end
         
     | 
| 
       56 
62 
     | 
    
         | 
| 
       57 
     | 
    
         
            -
                  def reconfigure_cloud!
         
     | 
| 
       58 
     | 
    
         
            -
                     
     | 
| 
      
 63 
     | 
    
         
            +
                  def reconfigure_cloud!(msg="force_reconfig")
         
     | 
| 
      
 64 
     | 
    
         
            +
                    messenger_cast!(msg)
         
     | 
| 
       59 
65 
     | 
    
         
             
                  end
         
     | 
| 
       60 
66 
     | 
    
         
             
                end
         
     | 
| 
       61 
67 
     | 
    
         
             
              end
         
     | 
    
        data/lib/poolparty/version.rb
    CHANGED
    
    
    
        data/poolparty.gemspec
    CHANGED