From cbeed2793a2a83e920797e886d7ed59aa3f3c257 Mon Sep 17 00:00:00 2001 From: TOKI Yoshinori Date: Thu, 21 Aug 2014 16:12:38 +0900 Subject: [PATCH] server configuration class. changed location of log file path. relative log file path -> relative location from base_dir. absolute log file path -> absolute location from root directory. --- lib/rims/server.rb | 6 +++++- test/test_config.rb | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/rims/server.rb b/lib/rims/server.rb index 5fc572c..27c7cb4 100644 --- a/lib/rims/server.rb +++ b/lib/rims/server.rb @@ -68,7 +68,11 @@ def through_server_params # def logging_params log_file = @config.delete(:log_file) || 'imap.log' - log_file_path = File.join(base_dir, File.basename(log_file)) + if (relative_path? log_file) then + log_file_path = File.join(base_dir, log_file) + else + log_file_path = log_file + end log_level = @config.delete(:log_level) || 'INFO' log_level = log_level.upcase diff --git a/test/test_config.rb b/test/test_config.rb index 8a52995..edcaad4 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -95,6 +95,18 @@ def test_logging_params log_opt_args: [] }) + assert_logging_params({ log_file: 'foo/bar/server.log' }, { + log_file: File.join(@base_dir, 'foo/bar/server.log'), + log_level: Logger::INFO, + log_opt_args: [] + }) + + assert_logging_params({ log_file: '/var/rims/server.log' }, { + log_file: '/var/rims/server.log', + log_level: Logger::INFO, + log_opt_args: [] + }) + assert_logging_params({ log_shift_age: 'daily' }, { log_file: File.join(@base_dir, 'imap.log'), log_level: Logger::INFO,