DistelliServiceFrameworkSinatra 1.0 → 1.1

data/lib/distelli/serviceframeworksinatra.rb

@@ -9,7 +9,12 @@ module Rack
   class CommonLogger
     def call(env)
       # do nothing
-      @app.call(env)
+      begin
+        @app.call(env)
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.inspect
+      end
     end
   end
 end
@@ -17,28 +22,26 @@ end
 module Distelli
   class ServiceBase < Sinatra::Base
 
-    my_layout = Logging::Layouts::Pattern.new(:pattern => "%d:[%l]:[%t]:[%c]:%m\n")
-    rf_appender = Logging::Appenders::RollingFile.new('TestRubyService', :filename => './logs/TestRubyService.log', :layout => my_layout, :roll_by => 'date', :age => '3600')
-    disable :raise_errors
-    disable :show_exceptions
-    disable :dump_errors
-    
-    # Parse the json config file and get the application name and
-    # version to set the log file name
-
+    # disable :raise_errors
+    # disable :show_exceptions
+    # disable :dump_errors
     LOGGER = Logging.logger[:root]
-    LOGGER.add_appenders(rf_appender)
     LOGGER.level = :debug
-    LOGGER.debug("TestRubyService initialized!")
 
-    def initialize()
+    def initialize(service_name)
       super()
+      my_layout = Logging::Layouts::Pattern.new(:pattern => "%d:[%l]:[%t]:[%c]:%m\n")
+      rf_appender = Logging::Appenders::RollingFile.new(service_name, :filename => './logs/'+service_name+'.log', :layout => my_layout, :roll_by => 'date', :age => '3600')
+
+      LOGGER.add_appenders(rf_appender)
+      LOGGER.info("Initialized service: "+service_name)
+
       @xml_marshaller = Distelli::XmlMarshaller.new
       @json_marshaller = Distelli::JsonMarshaller.new
     end
 
     def add_object(obj)
-      LOGGER.debug("Adding Model object: "+obj.inspect.to_s)
+      LOGGER.info("Added model object: "+obj.inspect.to_s)
       @xml_marshaller.add_object(obj)
       @json_marshaller.add_object(obj)
     end
@@ -65,7 +68,7 @@ module Distelli
       if http_code != nil
         status http_code
       end
-      
+
       headers_hash = Hash.new
       headers_hash[ServiceConstants::SERVER_HEADER] = "DistelliWS"
       headers_hash[ServiceConstants::REQUEST_ID_HEADER] = get_request_id()
@@ -95,7 +98,7 @@ module Distelli
         error = Distelli::ServerError.new("Cannot marshall error of type "+error.class.name+" Defaulting to ServerError")
         status error.http_code
       end
-      
+
       headers_hash = Hash.new
       headers_hash[ServiceConstants::SERVER_HEADER] = "DistelliWS"
       headers_hash[ServiceConstants::REQUEST_ID_HEADER] = get_request_id()
@@ -132,7 +135,7 @@ module Distelli
         return ServiceConstants::RESPONSE_TYPE_JSON
       end
     end
-    
+
     def get_request_id()
       request_id = request[ServiceConstants::REQUEST_ID_HEADER]
       if request_id != nil
@@ -155,7 +158,7 @@ module Distelli
       if response_type != nil
         return validate_response_type(response_type)
       end
-      
+
       response_type = nil
       params = request.params()
       if params != nil
@@ -186,7 +189,7 @@ module Distelli
     # Error Handlers
     ######################################
     error do
-      # Marshall the error as a server error 
+      # Marshall the error as a server error
       ex = env['sinatra.error']
       LOGGER.error('Unhandled Exception: '+ex.inspect+ex.backtrace.join("\n"))
       return marshall_error(ex)
@@ -199,7 +202,7 @@ module Distelli
     end
 
     error Distelli::ServerError do
-      # Marshall the Server Error Exception and set the response code    
+      # Marshall the Server Error Exception and set the response code
       se = env['sinatra.error']
       return marshall_error(se)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DistelliServiceFrameworkSinatra
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra