From e0f0ccdc3b75c78d001aade133e8edd1e481bd30 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Wed, 4 Feb 2015 16:12:05 +0900
Subject: [PATCH] DRY

---
 app/models/fluentd/agent/fluentd_gem.rb  | 5 +----
 app/models/fluentd/agent/local_common.rb | 7 +++++++
 app/models/fluentd/agent/td_agent.rb     | 5 +----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/models/fluentd/agent/fluentd_gem.rb b/app/models/fluentd/agent/fluentd_gem.rb
index 3be1c1a..3c013d1 100644
--- a/app/models/fluentd/agent/fluentd_gem.rb
+++ b/app/models/fluentd/agent/fluentd_gem.rb
@@ -43,10 +43,7 @@ class Fluentd
       end
 
       def dryrun!(file_path = nil)
-        Bundler.with_clean_env do
-          system("fluentd -q --dry-run #{options_to_argv(config_file: file_path)}", out: File::NULL, err: File::NULL)
-          raise ::Fluentd::Agent::ConfigError, last_error_message unless $?.exitstatus.zero?
-        end
+        exec_dryrun("fluentd", file_path)
       end
 
       def config_syntax_check
diff --git a/app/models/fluentd/agent/local_common.rb b/app/models/fluentd/agent/local_common.rb
index 9b65971..85e0aeb 100644
--- a/app/models/fluentd/agent/local_common.rb
+++ b/app/models/fluentd/agent/local_common.rb
@@ -82,6 +82,13 @@ class Fluentd
 
       private
 
+      def exec_dryrun(exe, file_path = nil)
+        Bundler.with_clean_env do
+          system("#{exe} -q --dry-run #{options_to_argv(config_file: file_path)}", out: File::NULL, err: File::NULL)
+          raise ::Fluentd::Agent::ConfigError, last_error_message unless $?.exitstatus.zero?
+        end
+      end
+
       def backup_config
         return unless File.exists? config_file
 
diff --git a/app/models/fluentd/agent/td_agent.rb b/app/models/fluentd/agent/td_agent.rb
index 5c1c422..1f273ff 100644
--- a/app/models/fluentd/agent/td_agent.rb
+++ b/app/models/fluentd/agent/td_agent.rb
@@ -17,10 +17,7 @@ class Fluentd
       end
 
       def dryrun!(file_path = nil)
-        Bundler.with_clean_env do
-          system("/usr/sbin/td-agent --dry-run #{options_to_argv(config_file: file_path)}", out: File::NULL, err: File::NULL)
-          raise ::Fluentd::Agent::ConfigError, last_error_message unless $?.exitstatus.zero?
-        end
+        exec_dryrun("/usr/sbin/td-agent", file_path)
       end
 
       case FluentdUI.platform