ernie 0.3.3 → 0.3.4

data/README.md

@@ -23,10 +23,7 @@ Installation
 
 You must have Erlang installed before installing Ernie.
 
-From GitHub:
-
-    gem install mojombo-ernie -s http://gems.github.com \
-                              -s http://gemcutter.org
+    $ gem install ernie -s http://gemcutter.org
 
 
 Running
@@ -43,6 +40,7 @@ Running
       <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 a list of connection and handler statistics.
     
     Examples:
       ernie -d -p 9999 -n 10 -h calc.rb

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 3

data/elib/ernie_server.erl

@@ -9,7 +9,8 @@
          terminate/2, code_change/3]).
 
 -record(state, {lsock = undefined,
-                pending = queue:new()}).
+                pending = queue:new(),
+                count = 0}).
 
 -record(request, {sock = undefined,
                   info = undefined,
@@ -70,7 +71,9 @@ handle_call(_Request, _From, State) ->
 handle_cast({process, Sock}, State) ->
   Request = #request{sock = Sock},
   State2 = receive_term(Request, State),
-  {noreply, State2};
+  Count = State2#state.count,
+  State3 = State2#state{count = Count + 1},
+  {noreply, State3};
 handle_cast({asset_freed}, State) ->
   case queue:is_empty(State#state.pending) of
     false ->
@@ -127,11 +130,13 @@ process_admin(Sock, reload_handlers, _Args, State) ->
   ok = gen_tcp:close(Sock),
   State;
 process_admin(Sock, stats, _Args, State) ->
+  Count = State#state.count,
+  CountString = list_to_binary([<<"connections.total=">>, integer_to_list(Count), <<"\n">>]),
   IdleWorkers = asset_pool:idle_worker_count(),
-  IdleWorkersString = list_to_binary([<<"idle workers: ">>, integer_to_list(IdleWorkers), <<"\n">>]),
+  IdleWorkersString = list_to_binary([<<"workers.idle=">>, integer_to_list(IdleWorkers), <<"\n">>]),
   QueueLength = queue:len(State#state.pending),
-  QueueLengthString = list_to_binary([<<"pending connections: ">>, integer_to_list(QueueLength), <<"\n">>]),
-  gen_tcp:send(Sock, term_to_binary({reply, list_to_binary([IdleWorkersString, QueueLengthString])})),
+  QueueLengthString = list_to_binary([<<"connections.pending=">>, integer_to_list(QueueLength), <<"\n">>]),
+  gen_tcp:send(Sock, term_to_binary({reply, list_to_binary([CountString, IdleWorkersString, QueueLengthString])})),
   ok = gen_tcp:close(Sock),
   State;
 process_admin(Sock, _Fun, _Args, State) ->

data/ernie.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-08-20}
+  s.date = %q{2009-09-06}
   s.default_executable = %q{ernie}
   s.email = %q{tom@mojombo.com}
   s.executables = ["ernie"]

data/examples/calc.rb

@@ -1,8 +1,24 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ernie'
 
+# Just about the easiest example I could thing of.
 mod(:calc) do
   fun(:add) do |a, b|
     a + b
   end
+end
+
+# Useful for tests that need to simulate longer running functions.
+mod(:slowcalc) do
+  fun(:add) do |a, b|
+    sleep(rand * 2)
+    a + b
+  end
+end
+
+# Throw an error
+mod(:errorcalc) do
+  fun(:add) do |a, b|
+    raise "abandon hope!"
+  end
 end

data/lib/ernie.rb

@@ -59,6 +59,8 @@ class Ernie
   def self.dispatch(mod, fun, args)
     xargs = deconvert(args)
     self.log("-- " + [mod, fun, xargs].inspect)
+    self.mods[mod] || raise(ServerError.new("No such module: '#{mod}'"))
+    self.mods[mod].funs[fun] || raise(ServerError.new("No such function '#{mod}:#{fun}'"))
     res = self.mods[mod].funs[fun].call(*xargs)
     convert(res)
   end
@@ -74,8 +76,13 @@ class Ernie
           xres = [:reply, res]
           self.log("<- " + xres.inspect)
           f.send!(xres)
+        rescue ServerError => e
+          xres = [:error, [:server, 0, e.message, e.backtrace]]
+          self.log("<- " + xres.inspect)
+          self.log(e.backtrace.join("\n"))
+          f.send!(xres)
         rescue Object => e
-          xres = [:error, [:user, 0, e.message]]
+          xres = [:error, [:user, 0, e.message, e.backtrace]]
           self.log("<- " + xres.inspect)
           self.log(e.backtrace.join("\n"))
           f.send!(xres)
@@ -105,6 +112,8 @@ class Ernie
   end
 end
 
+class Ernie::ServerError < StandardError; end
+
 class Ernie::Mod
   attr_accessor :name, :funs
 

data/test/load.rb

@@ -1,14 +1,18 @@
 require 'bertrpc'
 
+$stdout.sync = true
+
 threads = []
 svc = BERTRPC::Service.new('localhost', 8000)
 
-5.times do
+8.times do
   threads << Thread.new do
     i = 0
-    100.times { i += svc.call.calc.add(1, 2) }
-    print "#{i}\n"
+    10.times { i += svc.call.calc.add(1, 2); print '.'; $stdout.flush }
+    print "(#{i})"
   end
 end
 
-threads.each { |t| t.join }
+threads.each { |t| t.join }
+
+puts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency