ernie 2.1.0 → 2.2.0

data/History.txt

@@ -1,3 +1,7 @@
+= 2.2.0 / 2010-03-12
+  * Minor Additions
+    * Set procline for external Ruby handlers
+
 = 2.1.0 / 2010-02-20
   * Major Additions
     * Add access logging

data/Rakefile

@@ -5,7 +5,9 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "ernie"
+    gem.rubyforge_project = "ernie"
     gem.summary = %Q{Ernie is a BERT-RPC server implementation.}
+    gem.description = %Q{Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem.}
     gem.email = "tom@mojombo.com"
     gem.homepage = "http://github.com/mojombo/ernie"
     gem.authors = ["Tom Preston-Werner"]

data/VERSION.yml

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

data/elib/asset_pool.erl

@@ -139,4 +139,17 @@ start_handlers(Assets, Count, Handler, Token) ->
   start_handlers(Assets2, Count - 1, Handler, Token).
 
 create_asset(Handler, Token) ->
-  {asset, port_wrapper:wrap_link(Handler), Token}.
+  Len = length(Handler),
+  case Len > 150 of
+    true -> Cmd = Handler;
+    false -> Cmd = lists:flatten(Handler ++ " --procline " ++ pad(150 - Len - 12))
+  end,
+  io:format("~p~n", [Cmd]),
+  {asset, port_wrapper:wrap_link(Cmd), Token}.
+
+pad(Size) ->
+  pad(Size, []).
+pad(0, Acc) ->
+  Acc;
+pad(Size, Acc) ->
+  pad(Size - 1, ["x" | Acc]).

data/ernie.gemspec

@@ -5,12 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "2.1.0"
+  s.version = "2.2.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-02-24}
+  s.date = %q{2010-03-12}
   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}
   s.executables = ["ernie"]
   s.extensions = ["ext/extconf.rb", "ext/extconf.rb"]
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mojombo/ernie}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{ernie}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ernie is a BERT-RPC server implementation.}
   s.test_files = [

data/lib/ernie.rb

@@ -6,8 +6,11 @@ class Ernie
   class << self
     attr_accessor :mods, :current_mod, :log
     attr_accessor :auto_start
+    attr_accessor :count, :virgin_procline
   end
 
+  self.count = 0
+  self.virgin_procline = $0
   self.mods = {}
   self.current_mod = nil
   self.log = Logger.new(STDOUT)
@@ -117,6 +120,7 @@ class Ernie
   #
   # Loops forever
   def self.start
+    self.procline('starting')
     self.log.info("(#{Process.pid}) Starting")
     self.log.debug(self.mods.inspect)
 
@@ -126,7 +130,10 @@ class Ernie
     output.sync = true
 
     loop do
+      self.procline('waiting')
       iruby = self.read_berp(input)
+      self.count += 1
+
       unless iruby
         puts "Could not read BERP length header. Ernie server may have gone away. Exiting now."
         self.log.info("(#{Process.pid}) Could not read BERP length header. Ernie server may have gone away. Exiting now.")
@@ -135,6 +142,7 @@ class Ernie
 
       if iruby.size == 4 && iruby[0] == :call
         mod, fun, args = iruby[1..3]
+        self.procline("#{mod}:#{fun}(#{args})")
         self.log.info("-> " + iruby.inspect)
         begin
           res = self.dispatch(mod, fun, args)
@@ -154,6 +162,7 @@ class Ernie
         end
       elsif iruby.size == 4 && iruby[0] == :cast
         mod, fun, args = iruby[1..3]
+        self.procline("#{mod}:#{fun}(#{args})")
         self.log.info("-> " + [:cast, mod, fun, args].inspect)
         begin
           self.dispatch(mod, fun, args)
@@ -162,6 +171,7 @@ class Ernie
         end
         write_berp(output, t[:noreply])
       else
+        self.procline("invalid request")
         self.log.error("-> " + iruby.inspect)
         oruby = t[:error, t[:server, 0, "Invalid request: #{iruby.inspect}"]]
         self.log.error("<- " + oruby.inspect)
@@ -169,6 +179,19 @@ class Ernie
       end
     end
   end
+
+  def self.procline(msg)
+    $0 = "ernie handler #{VERSION} (ruby) - #{self.virgin_procline} - [#{self.count}] #{msg}"[0..159]
+  end
+
+  def self.version
+    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
+    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+  rescue
+    'unknown'
+  end
+
+  VERSION = self.version
 end
 
 class Ernie::ServerError < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-03-12 00:00:00 -08:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
-description: 
+description: Ernie is an Erlang/Ruby hybrid BERT-RPC server implementation packaged as a gem.
 email: tom@mojombo.com
 executables: 
 - ernie
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: ernie
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3