From 5ae6a4da93c7e18e34a90a5b5fc15f7dc2ab3e2d Mon Sep 17 00:00:00 2001 From: Minero Aoki Date: Wed, 12 Jul 2017 14:21:57 +0900 Subject: [PATCH 1/2] [fix] --log-dir/--log-path and --s3-log was wrongly not ommittable --- lib/bricolage/application.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bricolage/application.rb b/lib/bricolage/application.rb index fd04251..88cb8b0 100644 --- a/lib/bricolage/application.rb +++ b/lib/bricolage/application.rb @@ -258,9 +258,9 @@ def common_options end def log_path_format - if opt = @opts['log-dir'] + if opt = @opts['log-dir'] and opt.value LogFilePath.new("#{opt.value}/%{std}.log") - elsif opt = @opts['log-path'] + elsif opt = @opts['log-path'] and opt.value LogFilePath.new(opt.value) else nil @@ -277,8 +277,7 @@ def log_s3_key_format def s3_log_spec @s3_log_spec ||= - if opt = @opts['s3-log'] - spec = opt.value + if opt = @opts['s3-log'] and spec = opt.value ds, k = spec.split(':', 2) k = k.to_s.strip key = k.empty? ? nil : k From 850c0b64151d1decd6166ad651b74868efaf936a Mon Sep 17 00:00:00 2001 From: Minero Aoki Date: Wed, 12 Jul 2017 14:23:17 +0900 Subject: [PATCH 2/2] version 2.24.2 --- RELEASE.md | 4 ++++ lib/bricolage/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index cc46e1e..12c6eea 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,9 @@ # Bricolage Release Note +## version 5.24.2 + +- [fix] --log-dir, --log-path and --s3-log options are wrongly not ommittable + ## version 5.24.1 - [fix] --enable-queue did not work diff --git a/lib/bricolage/version.rb b/lib/bricolage/version.rb index 8877df8..6b1a83a 100644 --- a/lib/bricolage/version.rb +++ b/lib/bricolage/version.rb @@ -1,4 +1,4 @@ module Bricolage APPLICATION_NAME = 'Bricolage' - VERSION = '5.24.1' + VERSION = '5.24.2' end