Merge branch 'features' into dev

This commit is contained in:
amartynov 2015-10-05 15:30:57 +03:00
commit 82cf66480f

View File

@ -24,7 +24,7 @@ module Devops
register Sinatra::DevopsAuth register Sinatra::DevopsAuth
@@logger = nil @@logger = nil
@@access_logger = DevopsLogger.access_logger(File.join(config[:log_dir], "devops-api2.access.log")) @@access_logger = DevopsLogger.access_logger(File.join(DevopsConfig.config[:log_dir], "devops-api2.access.log"))
configure :production do configure :production do
config = DevopsConfig.config config = DevopsConfig.config