tkellem 0.8.4 → 0.8.5

data/lib/tkellem/bouncer.rb

@@ -153,6 +153,7 @@ class Bouncer
   alias_method :log_name, :name
 
   def send_msg(msg)
+    return unless @conn
     trace "to server: #{msg}"
     @conn.send_data("#{msg}\r\n")
   end

data/lib/tkellem/bouncer_connection.rb

@@ -31,10 +31,12 @@ module BouncerConnection
   end
 
   def post_init
-    if ssl
-      start_tls :verify_peer => false
-    else
-      ssl_handshake_completed
+    failsafe(:post_init) do
+      if ssl
+        start_tls :verify_peer => false
+      else
+        ssl_handshake_completed
+      end
     end
   end
 
@@ -66,45 +68,39 @@ module BouncerConnection
   end
 
   def receive_line(line)
-    trace "from client: #{line}"
-    msg = IrcMessage.parse(line)
-
-    command = msg.command
-    if @user && command == 'PRIVMSG' && msg.args.first == '-tkellem'
-      msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
-    elsif command == 'TKELLEM'
-      msg_tkellem(msg)
-    elsif command == 'CAP'
-      # TODO: full support for CAP -- this just gets mobile colloquy connecting
-      if msg.args.first =~ /req/i
-        send_msg("CAP NAK")
-      end
-    elsif command == 'PASS' && @state == :auth
-      @password = msg.args.first
-    elsif command == 'NICK' && @state == :auth
-      @connecting_nick = msg.args.first
-      maybe_connect
-    elsif command == 'QUIT'
-      close_connection
-    elsif command == 'USER' && @state == :auth
-      unless @username
-        @username, @conn_info = msg.args.first.strip.split('@', 2).map { |a| a.downcase }
+    failsafe("message: {#{line}}") do
+      trace "from client: #{line}"
+      msg = IrcMessage.parse(line)
+
+      command = msg.command
+      if @user && command == 'PRIVMSG' && msg.args.first == '-tkellem'
+        msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
+      elsif command == 'TKELLEM'
+        msg_tkellem(msg)
+      elsif command == 'CAP'
+        # TODO: full support for CAP -- this just gets mobile colloquy connecting
+        if msg.args.first =~ /req/i
+          send_msg("CAP NAK")
+        end
+      elsif command == 'PASS' && @state == :auth
+        @password = msg.args.first
+      elsif command == 'NICK' && @state == :auth
+        @connecting_nick = msg.args.first
+        maybe_connect
+      elsif command == 'QUIT'
+        close_connection
+      elsif command == 'USER' && @state == :auth
+        unless @username
+          @username, @conn_info = msg.args.first.strip.split('@', 2).map { |a| a.downcase }
+        end
+        maybe_connect
+      elsif @state == :auth
+        error!("Protocol error. You must authenticate first.")
+      elsif @state == :connected
+        @bouncer.client_msg(self, msg)
+      else
+        say_as_tkellem("You must connect to an irc network to do that.")
       end
-      maybe_connect
-    elsif @state == :auth
-      error!("Protocol error. You must authenticate first.")
-    elsif @state == :connected
-      @bouncer.client_msg(self, msg)
-    else
-      say_as_tkellem("You must connect to an irc network to do that.")
-    end
-
-  rescue => e
-    error "Error handling message: {#{msg}} #{e}"
-    e.backtrace.each { |l| error l }
-    begin
-      error! "Internal Tkellem error."
-    rescue
     end
   end
 
@@ -148,7 +144,9 @@ module BouncerConnection
   end
 
   def unbind
-    @bouncer.disconnect_client(self) if @bouncer
+    failsafe(:unbind) do
+      @bouncer.disconnect_client(self) if @bouncer
+    end
   end
 end
 

data/lib/tkellem/irc_server.rb

@@ -16,27 +16,35 @@ module IrcServerConnection
   end
 
   def post_init
-    if @ssl
-      @bouncer.debug "starting TLS"
-      # TODO: support strict cert checks
-      start_tls :verify_peer => false
-    else
-      ssl_handshake_completed
+    failsafe(:post_init) do
+      if @ssl
+        @bouncer.debug "starting TLS"
+        # TODO: support strict cert checks
+        start_tls :verify_peer => false
+      else
+        ssl_handshake_completed
+      end
     end
   end
 
   def ssl_handshake_completed
-    EM.next_tick { @bouncer.connection_established(self) }
+    failsafe(:ssl_handshake_completed) do
+      EM.next_tick { @bouncer.connection_established(self) }
+    end
   end
 
   def receive_line(line)
-    trace "from server: #{line}"
-    msg = IrcMessage.parse(line)
-    @bouncer.server_msg(msg)
+    failsafe(:receive_line) do
+      trace "from server: #{line}"
+      msg = IrcMessage.parse(line)
+      @bouncer.server_msg(msg)
+    end
   end
 
   def unbind
-    @bouncer.disconnected!
+    failsafe(:unbind) do
+      @bouncer.disconnected!
+    end
   end
 end
 

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/lib/tkellem.rb

@@ -4,11 +4,16 @@ module Tkellem
 
     def self.logger=(new_logger)
       @logger = new_logger
+      if @logger.is_a?(Logger)
+        @logger.formatter = proc do |severity, time, progname, msg|
+          obj, msg = msg if msg.is_a?(Array)
+          "#{time.strftime('%y-%m-%dT%H:%M:%S')} #{severity[0,3]} #{(obj && obj.log_name) || 'tkellem'} (#{obj && obj.object_id}): #{msg}\n"
+        end
+      end
     end
     def self.logger
       return @logger if @logger
-      @logger = Logger.new(STDERR)
-      @logger.datetime_format = "%Y-%m-%d"
+      self.logger = Logger.new(STDERR)
       @logger
     end
 
@@ -20,18 +25,31 @@ module Tkellem
     end
 
     def log_name
-      ""
+      nil
     end
 
     def trace(msg)
       puts("TRACE: #{log_name}: #{msg}") if EasyLogger.trace
     end
 
+    def failsafe(event)
+      yield
+    rescue => e
+      # if the failsafe rescue fails, we're in a really bad state and should probably just die
+      self.error "exception while handling #{event}"
+      self.error e.to_s
+      (e.backtrace || []).each { |line| self.error line }
+    end
+
     ::Logger::Severity.constants.each do |level|
       next if level == "UNKNOWN"
       module_eval(<<-EVAL, __FILE__, __LINE__)
-      def #{level.downcase}(msg)
-        EasyLogger.logger.#{level.downcase}("\#{log_name} (\#{object_id}): \#{msg}")
+      def #{level.downcase}(msg, &block)
+        if block
+          EasyLogger.logger.#{level.downcase} { [self, block.call] }
+        else
+          EasyLogger.logger.#{level.downcase}([self, msg])
+        end
       end
       EVAL
     end

metadata

@@ -2,7 +2,7 @@
 name: tkellem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Brian Palmer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -06:00
+date: 2011-06-18 00:00:00 -06:00
 default_executable: tkellem
 dependencies: 
 - !ruby/object:Gem::Dependency