MRI errors second try

lib/goliath/api.rb

@@ -175,11 +175,7 @@ def call(env)
         env[ASYNC_CALLBACK].call(validation_error(e.status_code, e.message))
 
       rescue Exception => e
-        logthis = "#{e.backtrace[0]}: #{e.message} (#{e.class})\n"
-        e.backtrace[1..-1].each do |bt|
-          logthis += "    from #{bt}\n"
-        end
-        env.logger.error(logthis)
+        env.log_exception(e)
         env[RACK_EXCEPTION] = e
 
         message = Goliath.env?(:production) ? 'An error happened' : e.message

lib/goliath/env.rb

@@ -113,6 +113,17 @@ def logger
       self[RACK_LOGGER]
     end
 
+    # Convenience method for logging exceptions
+    #
+    # @param e [Exception] The exception to log
+    def log_exception(e)
+      logthis = "Exception:\n#{e.backtrace[0].gsub(/(.*?:.*?):(.*)/,'\1 \2')}: #{e.message} (#{e.class})\n"
+      e.backtrace[1..-1].each do |bt|
+        logthis += "\tfrom #{bt.gsub(/(.*?:.*?):(.*)/,'\1 \2')}\n"
+      end
+      self[RACK_LOGGER].error(logthis)
+    end
+
     # @param name [Symbol] The method to check if we respond to it.
     # @return [Boolean] True if the Env responds to the method, false otherwise
     def respond_to?(name)

lib/goliath/rack/validator.rb

@@ -41,8 +41,7 @@ def safely(env, headers={})
         rescue Goliath::Validation::Error => e
           validation_error(e.status_code, e.message, headers)
         rescue Exception => e
-          env.logger.error(e.message)
-          env.logger.error(e.backtrace.join("\n"))
+          env.log_exception(e)
           validation_error(500, e.message, headers)
         end
       end

lib/goliath/request.rb

@@ -228,7 +228,7 @@ def server_exception(e)
       if e.is_a?(Goliath::Validation::Error)
         status, headers, body = [e.status_code, {}, ('{"error":"%s"}' % e.message)]
       else
-        @env[RACK_LOGGER].error("#{e.message}\n#{e.backtrace.join("\n")}")
+        @env.log_exception(e)
         message = Goliath.env?(:production) ? 'An error happened' : e.message
 
         status, headers, body = [500, {}, message]

lib/goliath/websocket.rb

@@ -81,7 +81,7 @@ def max_frame_size
         env['handler'] = EM::WebSocket::HandlerFactory.build_with_request(conn, request,
             upgrade_data, false, false)
       rescue Exception => e
-        env.logger.error("#{e.message}\n#{e.backtrace.join("\n")}")
+        env.log_exception(e)
         return [500, {}, {:error => "Upgrade failed"}]
       end
       env['handler'].run