ernie 2.5.1 → 2.5.2

data/History.txt

@@ -1,3 +1,7 @@
+= 2.5.2 / 2010-11-23
+  * Bug Fixes
+    * Don't do extra logging work unless necessary
+
 = 2.5.1 / 2010-11-22
   * Bug Fixes
     * Prevent ernie from trying to start in ernie bin

data/ernie.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.6'
 
   s.name              = 'ernie'
-  s.version           = '2.5.1'
-  s.date              = '2010-11-22'
+  s.version           = '2.5.2'
+  s.date              = '2010-11-23'
   s.rubyforge_project = 'ernie'
 
   s.summary     = "Ernie is a BERT-RPC server implementation."

data/lib/ernie.rb

@@ -3,7 +3,7 @@ require 'bert'
 require 'logger'
 
 class Ernie
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 
   class << self
     attr_accessor :mods, :current_mod, :log
@@ -123,8 +123,8 @@ class Ernie
   # Loops forever
   def self.start
     self.procline('starting')
-    self.log.info("(#{Process.pid}) Starting")
-    self.log.debug(self.mods.inspect)
+    self.log.info("(#{Process.pid}) Starting") if self.log.level <= Logger::INFO
+    self.log.debug(self.mods.inspect) if self.log.level <= Logger::DEBUG
 
     input = IO.new(3)
     output = IO.new(4)
@@ -138,34 +138,36 @@ class Ernie
 
       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.")
+        if self.log.level <= Logger::INFO
+          self.log.info("(#{Process.pid}) Could not read BERP length header. Ernie server may have gone away. Exiting now.")
+        end
         exit!
       end
 
       if iruby.size == 4 && iruby[0] == :call
         mod, fun, args = iruby[1..3]
         self.procline("#{mod}:#{fun}(#{args})")
-        self.log.info("-> " + iruby.inspect)
+        self.log.info("-> " + iruby.inspect) if self.log.level <= Logger::INFO
         begin
           res = self.dispatch(mod, fun, args)
           oruby = t[:reply, res]
-          self.log.debug("<- " + oruby.inspect)
+          self.log.debug("<- " + oruby.inspect) if self.log.level <= Logger::DEBUG
           write_berp(output, oruby)
         rescue ServerError => e
           oruby = t[:error, t[:server, 0, e.class.to_s, e.message, e.backtrace]]
-          self.log.error("<- " + oruby.inspect)
-          self.log.error(e.backtrace.join("\n"))
+          self.log.error("<- " + oruby.inspect) if self.log.level <= Logger::ERROR
+          self.log.error(e.backtrace.join("\n")) if self.log.level <= Logger::ERROR
           write_berp(output, oruby)
         rescue Object => e
           oruby = t[:error, t[:user, 0, e.class.to_s, e.message, e.backtrace]]
-          self.log.error("<- " + oruby.inspect)
-          self.log.error(e.backtrace.join("\n"))
+          self.log.error("<- " + oruby.inspect) if self.log.level <= Logger::ERROR
+          self.log.error(e.backtrace.join("\n")) if self.log.level <= Logger::ERROR
           write_berp(output, oruby)
         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)
+        self.log.info("-> " + [:cast, mod, fun, args].inspect) if self.log.level <= Logger::INFO
         begin
           self.dispatch(mod, fun, args)
         rescue Object => e
@@ -174,9 +176,9 @@ class Ernie
         write_berp(output, t[:noreply])
       else
         self.procline("invalid request")
-        self.log.error("-> " + iruby.inspect)
+        self.log.error("-> " + iruby.inspect) if self.log.level <= Logger::ERROR
         oruby = t[:error, t[:server, 0, "Invalid request: #{iruby.inspect}"]]
-        self.log.error("<- " + oruby.inspect)
+        self.log.error("<- " + oruby.inspect) if self.log.level <= Logger::ERROR
         write_berp(output, oruby)
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 5
-  - 1
-  version: 2.5.1
+  - 2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -08:00
+date: 2010-11-23 00:00:00 -08:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency