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.
MoritzFago · Aug 21, 2014 · cbeed27 · cbeed27
1 parent c74aca8
commit cbeed27
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git 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
@@ -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,