Merge pull request #154 from fluent/code_climate

Code climate

app/controllers/fluentd/settings_controller.rb

@@ -18,22 +18,9 @@ class Fluentd::SettingsController < ApplicationController
 
   def  update
     if params[:dryrun]
-      if dryrun(params[:config])
+      handle_dryrun
-        flash.now[:success] = I18n.t('messages.dryrun_is_passed')
     else
-        flash.now[:danger] = @fluentd.agent.last_error_message
+      handle_update
-      end
-      @config = params[:config]
-      render "edit"
-    else
-      begin
-        update_config(params[:config])
-        redirect_to daemon_setting_path(@fluentd)
-      rescue Fluent::ConfigParseError => e
-        @config = params[:config]
-        flash.now[:danger] = e.message
-        render "edit"
-      end
     end
   end
 
@@ -48,6 +35,25 @@ class Fluentd::SettingsController < ApplicationController
     @config = @fluentd.agent.config
   end
 
+  def handle_dryrun
+    if dryrun(params[:config])
+      flash.now[:success] = I18n.t('messages.dryrun_is_passed')
+    else
+      flash.now[:danger] = @fluentd.agent.last_error_message
+    end
+    @config = params[:config]
+    render "edit"
+  end
+
+  def handle_update
+    update_config(params[:config])
+    redirect_to daemon_setting_path(@fluentd)
+  rescue Fluent::ConfigParseError => e
+    @config = params[:config]
+    flash.now[:danger] = e.message
+    render "edit"
+  end
+
   def dryrun(conf)
     tmpfile = Tempfile.open("fluentd-test-config")
     tmpfile.write params[:config]

app/models/fluentd/agent/fluentd_gem.rb

@@ -43,10 +43,7 @@ class Fluentd
       end
 
       def dryrun!(file_path = nil)
-        Bundler.with_clean_env do
+        exec_dryrun("fluentd", file_path)
-          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
       end
 
       def config_syntax_check

app/models/fluentd/agent/local_common.rb

@@ -82,6 +82,13 @@ class Fluentd
 
       private
 
+      def exec_dryrun(command, file_path = nil)
+        Bundler.with_clean_env do
+          system("#{command} -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
 

app/models/fluentd/agent/td_agent.rb

@@ -17,10 +17,7 @@ class Fluentd
       end
 
       def dryrun!(file_path = nil)
-        Bundler.with_clean_env do
+        exec_dryrun("/usr/sbin/td-agent", file_path)
-          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
       end
 
       case FluentdUI.platform

spec/models/plugin_spec.rb

@@ -38,7 +38,7 @@ describe Plugin do
         it { should_not be_valid }
       end
 
-      context "somthing filled is valid" do
+      context "something filled is valid" do
         let(:gem_name) { "foobar" }
         it { should be_valid }
       end
@@ -53,7 +53,7 @@ describe Plugin do
         it { should_not be_valid }
       end
 
-      context "somthing filled is valid" do
+      context "something filled is valid" do
         let(:version) { "0.0.1" }
         it { should be_valid }
       end