fluentd-ui 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15d174d08432c496cf19eb5d6e6a663b9eead54b
-  data.tar.gz: f63750434b5475d44a1fd38a37573ed5aa71ab07
+  metadata.gz: 7d5210ae2603368a390f09da9318c5a81f2eeacf
+  data.tar.gz: 5193b86a5f75effaec831a90a911ab0231378e0e
 SHA512:
-  metadata.gz: b23b9df0277dadf689bdd4d9d72e233457bc138d3cdbce0811003451e9709a3fa9423fcc3b800c40760589a366eb2dce282942f10714a9b271bdc935dd04bf95
-  data.tar.gz: da92173f3fc2eeed2207c519d4ea77db9b5b85e36e7c3b54fa7313c551f773b7412ebaecd4baaa57aafc060331701616f74d6bedbb01de3cadb028ce46bcdf9c
+  metadata.gz: 0979f30e382c16a0519e2b3f556b92ff0c8df67208fd556d05e766b1c74d5e0f79a0f3c6ea84a733bba9f4538db65a20d84c7e5d6df8b235cb77a0454bb42e57
+  data.tar.gz: 502e7a129252caf39c4f73423d5ffa4080477844578ead61113b9c8d7aaf28d2622c762ef0cd7111e6516d661e2639c545a6fc20ab0cc0aa01326f3e1a24f0d2

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.3.18 - 2015/04/02
+* [fixed] #167 Apply bootstrap css to inputboxes in signin form
+* [fixed] #168 Fix the behavor mismatch between configtest and update (update failed but configtest is OK)
+
 Release 0.3.17 - 2015/04/01
 * [fixed] #164 Display add/remove icons correctly in out_forward settings page
 * [fixed] #165 Fix zombie process is created by clicking start button in dashboard

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.17)
+    fluentd-ui (0.3.18)
       addressable
       bundler
       diff-lcs
@@ -115,14 +115,14 @@ GEM
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.2.7)
+    jbuilder (2.2.12)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.2)
-    kramdown (1.5.0)
+    kramdown (1.6.0)
     kramdown-haml (0.0.3)
       haml
     launchy (2.4.3)
@@ -160,7 +160,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.11.0)
+    puma (2.11.1)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.3)
@@ -200,7 +200,7 @@ GEM
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rubyzip (1.1.6)
+    rubyzip (1.1.7)
     safe_yaml (1.0.4)
     sass (3.2.19)
     sass-rails (4.0.5)
@@ -234,7 +234,7 @@ GEM
     timers (1.1.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2014.10)
+    tzinfo-data (1.2015.2)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

data/app/controllers/fluentd/settings_controller.rb

@@ -37,7 +37,12 @@ class Fluentd::SettingsController < ApplicationController
 
   def handle_dryrun
     if dryrun(params[:config])
-      flash.now[:success] = I18n.t('messages.dryrun_is_passed')
+      begin
+        parse_config(params[:config])
+        flash.now[:success] = I18n.t('messages.dryrun_is_passed')
+      rescue Fluent::ConfigParseError => e
+        flash.now[:danger] = e.message
+      end
     else
       flash.now[:danger] = @fluentd.agent.log.last_error_message
     end
@@ -46,6 +51,7 @@ class Fluentd::SettingsController < ApplicationController
   end
 
   def handle_update
+    parse_config(params[:config])
     update_config(params[:config])
     redirect_to daemon_setting_path(@fluentd)
   rescue Fluent::ConfigParseError => e
@@ -61,8 +67,12 @@ class Fluentd::SettingsController < ApplicationController
     @fluentd.agent.dryrun(tmpfile.path)
   end
 
+  def parse_config(conf)
+    # V1Parser.parse could raise exception
+    Fluent::Config::V1Parser.parse(conf, @fluentd.config_file, File.dirname(@fluentd.config_file), binding)
+  end
+
   def update_config(conf)
-    Fluent::Config::V1Parser.parse(conf, @fluentd.config_file)
     @fluentd.agent.config_write conf
     @fluentd.agent.restart if @fluentd.agent.running?
   end

data/app/views/sessions/new.html.haml

@@ -6,8 +6,8 @@
     = render partial: "shared/error"
     = form_for(:session, url: sessions_path) do |f|
       .form-group
-        = f.text_field :name, placeholder: t('terms.name')
+        = f.text_field :name, placeholder: t('terms.name'), class: "form-control"
       .form-group
-        = f.password_field :password, placeholder: t('terms.password')
+        = f.password_field :password, placeholder: t('terms.password'), class: "form-control"
 
       = submit_tag t("terms.sign_in"), class: "btn btn-success"

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.17"
+  VERSION = "0.3.18"
 end

data/spec/features/setting_spec.rb

@@ -47,4 +47,48 @@ describe 'setting', stub: :daemon do
     current_path.should == '/daemon/setting'
     page.should have_css('pre', text: 'YET ANOTHER CONFIG')
   end
+
+  describe "config" do
+    before do
+      daemon.agent.config_write conf
+      click_link I18n.t('terms.edit')
+    end
+
+    context "plain config" do
+      let(:conf) { <<-'CONF' }
+      <source>
+        type forward
+      </source>
+      CONF
+
+      it 'configtest' do
+        click_button I18n.t('terms.configtest')
+        page.should have_css('.alert-success')
+      end
+
+      it "update & restart check" do
+        click_button I18n.t('terms.update')
+        daemon.agent.config.gsub("\r\n", "\n").should == conf # CodeMirror exchange \n -> \r\n
+      end
+    end
+
+    context "embedded config" do
+      let(:conf) { <<-'CONF' }
+      <source>
+        type forward
+        id "foo#{Time.now.to_s}"
+      </source>
+      CONF
+
+      it 'configtest' do
+        click_button I18n.t('terms.configtest')
+        page.should have_css('.alert-success')
+      end
+
+      it "update & restart check" do
+        click_button I18n.t('terms.update')
+        daemon.agent.config.gsub("\r\n", "\n").should == conf # CodeMirror exchange \n -> \r\n
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd