From afbe4f691f7c7e8ba27be90435200a67c2ab9895 Mon Sep 17 00:00:00 2001 From: amartynov Date: Thu, 16 Jul 2015 13:19:33 +0300 Subject: [PATCH] loggers --- devops-service/app/client/devops-client.rb | 9 +++++++-- devops-service/app/sidekiq_web.rb | 7 +++++++ devops-service/config.rb | 6 +++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/devops-service/app/client/devops-client.rb b/devops-service/app/client/devops-client.rb index fbe77aa..36ac9f0 100644 --- a/devops-service/app/client/devops-client.rb +++ b/devops-service/app/client/devops-client.rb @@ -1,5 +1,6 @@ require 'sinatra/base' require 'core/devops-logger' +require 'core/devops-config' class Client < Sinatra::Base @@ -9,7 +10,9 @@ class Client < Sinatra::Base end configure :production do - logger = DevopsLogger.create("/tmp/devops-client.log", Logger::INFO) + config = DevopsConfig.config + log_file = File.join(config[:log_dir], "devops-client.log") + logger = DevopsLogger.create(log_file, Logger::INFO) use Rack::CommonLogger, logger disable :dump_errors disable :show_exceptions @@ -18,7 +21,9 @@ class Client < Sinatra::Base end configure :development do - logger = DevopsLogger.create("/tmp/devops-client.log", Logger::DEBUG) + config = DevopsConfig.config + log_file = File.join(config[:log_dir], "devops-client.log") + logger = DevopsLogger.create(log_file, Logger::DEBUG) use Rack::CommonLogger, logger # set :logging, Logger::DEBUG disable :raise_errors diff --git a/devops-service/app/sidekiq_web.rb b/devops-service/app/sidekiq_web.rb index 6a8ba04..4a3970f 100644 --- a/devops-service/app/sidekiq_web.rb +++ b/devops-service/app/sidekiq_web.rb @@ -1,3 +1,6 @@ +require 'core/devops-logger' +require 'core/devops-config' + module Devops class SidekiqApplication < Application @@ -7,6 +10,10 @@ module Devops end def routes + config = DevopsConfig.config + log_file = File.join(config[:log_dir], "devops-sidekiq-web.log") + logger = DevopsLogger.create(log_file, Logger::INFO) + Sidekiq::Web.use Rack::CommonLogger, logger Devops::Routes.route "/sidekiq", Sidekiq::Web end diff --git a/devops-service/config.rb b/devops-service/config.rb index 5a42369..15b5b83 100644 --- a/devops-service/config.rb +++ b/devops-service/config.rb @@ -1,5 +1,5 @@ -# path to log file -config[:log_file] = "/path/to/log" +# path to log dir +config[:log_dir] = "/path/to/log" # path to chef knife.rb file config[:knife_config_file] = "/path/to/.chef/knife.rb" # role name separator @@ -40,4 +40,4 @@ config[:static_ssh_key] = "ssh_key" # or nil config[:static_certificate] = "/path/to/.ssh/static.pem" config[:debug] = true -config[:stub_classes] = true \ No newline at end of file +config[:stub_classes] = true