ernie 2.2.1 → 2.3.0

data/History.txt

@@ -1,3 +1,7 @@
+= 2.3.0 / 2010-05-17
+  * Minor Additions
+    * Add 'halt' command for gracefully shutting down
+
 = 2.2.1 / 2010-05-13
   * Minor Changes
     * Increase TCP backlog from 5 to 128

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 2
+:minor: 3
 :build: 
-:patch: 1
+:patch: 0
 :major: 2

data/bin/ernie

@@ -33,6 +33,8 @@ Commands:
   <none>                Start an Ernie server.
   reload-handlers       Gracefully reload all of the the ruby handlers
                         and use the new code for all subsequent requests.
+  stats                 Print usage statistics.
+  halt                  Gracefully halt the server.
 
 Options:
 HELP
@@ -68,10 +70,11 @@ OptionParser.new do |opts|
 end.parse!
 
 if command = ARGV[0]
-  if !%w{reload-handlers stats}.include?(command)
+  if !%w{reload-handlers stats halt}.include?(command)
     puts "Invlalid command. Valid commands are:"
     puts "  reload-handlers"
     puts "  stats"
+    puts "  halt"
     exit(1)
   end
 

data/elib/asset_pool.erl

@@ -9,6 +9,7 @@
          terminate/2, code_change/3]).
 
 -record(state, {assets = undefined,
+                count = undefined,
                 handler = undefined,
                 token = undefined}).
 
@@ -48,7 +49,7 @@ init([Handler, Count]) ->
   Token = make_ref(),
   Assets = start_handlers(Count, Handler, Token),
   logger:debug("Assets = ~p~n", [Assets]),
-  {ok, #state{assets = Assets, handler = Handler, token = Token}}.
+  {ok, #state{assets = Assets, count = Count, handler = Handler, token = Token}}.
 
 %%--------------------------------------------------------------------
 %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |

data/elib/ernie.hrl

@@ -1,7 +1,9 @@
 -record(state, {lsock = undefined,      % the listen socket
+                listen = true,          % whether to listen for new connections
                 hq = queue:new(),       % high priority queue
                 lq = queue:new(),       % low priority queue
                 count = 0,              % total request count
+                zcount = 0,             % total completed request count
                 map = undefined}).      % module map. tuples of {Mod, Id}
 
 -record(request, {sock = undefined,     % connection socket

data/elib/ernie_admin.erl

@@ -8,6 +8,9 @@
 process(Sock, reload_handlers, _Args, State) ->
   spawn(fun() -> process_reload_assets(Sock, State) end),
   State;
+process(Sock, halt, _Args, State) ->
+  process_halt(Sock, State),
+  State#state{listen = false};
 process(Sock, stats, _Args, State) ->
   spawn(fun() -> process_stats(Sock, State) end),
   State;
@@ -29,14 +32,27 @@ reload({_Mod, native}) ->
 reload({_Mod, Pid}) ->
   asset_pool:reload_assets(Pid).
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Halt
+
+process_halt(Sock, State) ->
+  gen_tcp:send(Sock, term_to_binary({reply, <<"Halting.">>})),
+  ok = gen_tcp:close(Sock),
+  gen_tcp:close(State#state.lsock),
+  case State#state.count =:= State#state.zcount of
+    true -> halt();
+    false -> ok
+  end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Stats
 
 process_stats(Sock, State) ->
   CountString = stat(count, State),
+  ZCountString = stat(zcount, State),
   IdleWorkersString = stat(idle, State),
   QueueLengthString = stat(queue, State),
-  StatString = list_to_binary([CountString, IdleWorkersString, QueueLengthString]),
+  StatString = list_to_binary([CountString, ZCountString, IdleWorkersString, QueueLengthString]),
   Data = term_to_binary({reply, StatString}),
   gen_tcp:send(Sock, Data),
   ok = gen_tcp:close(Sock).
@@ -44,6 +60,9 @@ process_stats(Sock, State) ->
 stat(count, State) ->
   Count = State#state.count,
   list_to_binary([<<"connections.total=">>, integer_to_list(Count), <<"\n">>]);
+stat(zcount, State) ->
+  ZCount = State#state.zcount,
+  list_to_binary([<<"connections.completed=">>, integer_to_list(ZCount), <<"\n">>]);
 stat(idle, State) ->
   IdleMap = lists:map((fun idle/1), State#state.map),
   list_to_binary(IdleMap);

data/elib/ernie_native.erl

@@ -20,6 +20,7 @@ process(ActionTerm, Request) ->
       gen_tcp:send(Sock, Data)
   end,
   ok = gen_tcp:close(Sock),
+  ernie_server:fin(),
   Log = Request#request.log,
   Log2 = Log#log{tdone = erlang:now()},
   Request2 = Request#request{log = Log2},

data/elib/ernie_server.erl

@@ -3,7 +3,7 @@
 -include_lib("ernie.hrl").
 
 %% api
--export([start_link/1, start/1, process/1, kick/0]).
+-export([start_link/1, start/1, process/1, kick/0, fin/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -25,6 +25,9 @@ process(Sock) ->
 kick() ->
   gen_server:cast({global, ?MODULE}, kick).
 
+fin() ->
+  gen_server:cast({global, ?MODULE}, fin).
+
 %%====================================================================
 %% gen_server callbacks
 %%====================================================================
@@ -84,6 +87,15 @@ handle_cast(kick, State) ->
           {noreply, State}
       end
   end;
+handle_cast(fin, State) ->
+  Listen = State#state.listen,
+  Count = State#state.count,
+  ZCount = State#state.zcount + 1,
+  logger:debug("Fin; Listen = ~p (~p/~p)~n", [Listen, Count, ZCount]),
+  case Listen =:= false andalso ZCount =:= Count of
+    true -> halt();
+    false -> {noreply, State#state{zcount = ZCount}}
+  end;
 handle_cast(_Msg, State) -> {noreply, State}.
 
 handle_info(Msg, State) ->
@@ -119,6 +131,7 @@ try_listen(Port, Times) ->
   case Res of
     {ok, LSock} ->
       error_logger:info_msg("Listening on port ~p~n", [Port]),
+      % gen_tcp:controlling_process(LSock, ernie_server),
       {ok, LSock};
     {error, Reason} ->
       error_logger:info_msg("Could not listen on port ~p: ~p~n", [Port, Reason]),
@@ -127,10 +140,18 @@ try_listen(Port, Times) ->
   end.
 
 loop(LSock) ->
-  {ok, Sock} = gen_tcp:accept(LSock),
-  logger:debug("Accepted socket: ~p~n", [Sock]),
-  ernie_server:process(Sock),
-  loop(LSock).
+  case gen_tcp:accept(LSock) of
+    {error, closed} ->
+      logger:debug("Listen socket closed~n", []),
+      timer:sleep(infinity);
+    {error, Error} ->
+      logger:debug("Connection accept error: ~p~n", [Error]),
+      loop(LSock);
+    {ok, Sock} ->
+      logger:debug("Accepted socket: ~p~n", [Sock]),
+      ernie_server:process(Sock),
+      loop(LSock)
+  end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Receive and process
@@ -287,6 +308,7 @@ process_now(Pid, Request, Asset) ->
       ernie_access_logger:err(Request2, "External process error ~w: ~w", [AnyClass, AnyError])
   after
     asset_pool:return(Pid, Asset),
+    ernie_server:fin(),
     ernie_server:kick(),
     logger:debug("Returned asset ~p~n", [Asset]),
     gen_tcp:close(Request#request.sock),

data/ernie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "2.2.1"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-05-17}
   s.default_executable = %q{ernie}
   s.description = %q{Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem.}
   s.email = %q{tom@mojombo.com}

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 2
-  - 1
-  version: 2.2.1
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -07:00
+date: 2010-05-17 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency