diff --git a/devops-service/app/client/devops-client.rb b/devops-service/app/client/devops-client.rb index 36ac9f0..4aaaa52 100644 --- a/devops-service/app/client/devops-client.rb +++ b/devops-service/app/client/devops-client.rb @@ -11,27 +11,32 @@ class Client < Sinatra::Base configure :production do config = DevopsConfig.config - log_file = File.join(config[:log_dir], "devops-client.log") + log_file = File.join(config[:log_dir], "devops-client.access.log") logger = DevopsLogger.create(log_file, Logger::INFO) use Rack::CommonLogger, logger disable :dump_errors disable :show_exceptions -# set :logging, Logger::INFO logger.info "Production mode" end configure :development do - config = DevopsConfig.config - log_file = File.join(config[:log_dir], "devops-client.log") - logger = DevopsLogger.create(log_file, Logger::DEBUG) +# config = DevopsConfig.config +# log_file = File.join(config[:log_dir], "devops-client.log") + logger = DevopsLogger.create(STDOUT, Logger::DEBUG) use Rack::CommonLogger, logger -# set :logging, Logger::DEBUG disable :raise_errors # disable :dump_errors set :show_exceptions, :after_handler logger.info "Development mode" + DevopsLogger.level = Logger::DEBUG end +=begin + before do + env["rack.errors"] = error_logger + end +=end + # Route to download devops client get "/devops-client.gem" do begin diff --git a/devops-service/core/devops-logger.rb b/devops-service/core/devops-logger.rb index 39a8dcd..0060aab 100644 --- a/devops-service/core/devops-logger.rb +++ b/devops-service/core/devops-logger.rb @@ -3,18 +3,26 @@ require "logger" class DevopsLogger def self.create out, level=Logger::INFO, format='%a %d-%m-%Y %H%M ' - @_logger = Logger.new out - @_logger.level = level - @_logger.datetime_format = format - @_logger.debug("Logger has been created") - @_logger + logger = Logger.new out + logger.level = level + logger.datetime_format = format + logger.debug("Logger has been created") + logger end def self.logger - @_logger + @_logger ||= DevopsLogger.create(File.join(DevopsConfig.config[:log_dir], "devops.errors.log")) end def self.logger= logger @_logger = logger end + + def self.level= level + @level = level + end + + def self.level + @level || Logger::INFO + end end