From 3033bfd79f778a22f4c0f81e074747c9818c4ad8 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 14:20:32 +0900
Subject: [PATCH 01/22] update fluentd gem to v0.10.48+ for Supervisor
 default_options

---
 Gemfile.lock       | 6 +++---
 fluentd-ui.gemspec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e8640c..6d65f36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       bcrypt (~> 3.1.5)
       bundler (~> 1.5)
       coffee-rails (~> 4.0.0)
-      fluentd (= 0.10.46)
+      fluentd (~> 0.10.48)
       font-awesome-rails
       haml-rails (~> 0.5.3)
       httpclient
@@ -81,14 +81,14 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    fluentd (0.10.46)
+    fluentd (0.10.48)
       cool.io (>= 1.1.1, < 2.0.0, != 1.2.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
       msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       sigdump (~> 0.2.2)
       yajl-ruby (~> 1.0)
-    font-awesome-rails (4.0.3.1)
+    font-awesome-rails (4.1.0.0)
       railties (>= 3.2, < 5.0)
     haml (4.0.5)
       tilt
diff --git a/fluentd-ui.gemspec b/fluentd-ui.gemspec
index 5d63c53..d37dab8 100644
--- a/fluentd-ui.gemspec
+++ b/fluentd-ui.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", "0.10.46"
+  spec.add_dependency "fluentd", "~> 0.10.48"
   spec.add_dependency 'rails', '4.1.1'
   spec.add_dependency 'sucker_punch', "~> 1.0.5"
   spec.add_dependency 'i18n_generators', '1.2.1'

From 62e8ea467a88746956d38949fd52e4e902e5d615 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 15:30:19 +0900
Subject: [PATCH 02/22] Separate fluentd, td-agent, and remote handling by
 class

---
 app/controllers/fluentd/daemons_controller.rb |   2 +-
 app/controllers/fluentd_controller.rb         |   2 +-
 app/models/fluentd.rb                         | 125 +++++-------------
 app/models/fluentd/agent.rb                   | 117 ++++++++++++++++
 app/views/fluentd/daemons/show.html.haml      |   8 +-
 app/views/fluentd/index.html.haml             |   4 +-
 db/migrate/20140522055753_create_fluentds.rb  |  12 ++
 db/schema.rb                                  |  11 +-
 spec/models/fluentd_spec.rb                   |   5 +
 9 files changed, 188 insertions(+), 98 deletions(-)
 create mode 100644 app/models/fluentd/agent.rb
 create mode 100644 db/migrate/20140522055753_create_fluentds.rb
 create mode 100644 spec/models/fluentd_spec.rb

diff --git a/app/controllers/fluentd/daemons_controller.rb b/app/controllers/fluentd/daemons_controller.rb
index 1103cf5..56250e6 100644
--- a/app/controllers/fluentd/daemons_controller.rb
+++ b/app/controllers/fluentd/daemons_controller.rb
@@ -27,6 +27,6 @@ class Fluentd::DaemonsController < ApplicationController
   private
 
   def fluentd
-    @fluentd ||= Fluentd.new(Rails.root + "tmp" + "fluentd") # TODO
+    @fluentd = Fluentd.find(params[:fluentd_id])
   end
 end
diff --git a/app/controllers/fluentd_controller.rb b/app/controllers/fluentd_controller.rb
index 6531678..306810e 100644
--- a/app/controllers/fluentd_controller.rb
+++ b/app/controllers/fluentd_controller.rb
@@ -2,6 +2,6 @@ class FluentdController < ApplicationController
   before_action :login_required
 
   def index
-    @daemons = [Fluentd.new(Rails.root + "tmp" + "fluentd")] # TODO
+    @fluentds = Fluentd.all
   end
 end
diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb
index 91e8e01..ef684a6 100644
--- a/app/models/fluentd.rb
+++ b/app/models/fluentd.rb
@@ -1,109 +1,56 @@
-Bundler.require(:default, :development)
+class Fluentd < ActiveRecord::Base
+  validate :validate_permissions
 
-require 'fluent/log'
-require 'fluent/env'
-require 'fluent/version'
-require 'fluent/supervisor'
-
-class Fluentd
-  attr_reader :root_dir
-
-  def initialize(root_dir)
-    @root_dir = root_dir
-    FileUtils.mkdir_p @root_dir
+  def fluentd?
+    variant == "fluentd"
   end
 
-  def pid_file
-    File.join(root_dir, "fluentd.pid")
-  end
-
-  def pid
-    return unless File.exists?(pid_file)
-    File.read(pid_file)
-  end
-
-  def log_file
-    File.join(root_dir, "fluentd.log")
-  end
-
-  def config_file
-    file = File.join(root_dir, "fluentd.conf")
-    unless File.exists?(file)
-      File.open(file, "w") {|f| f.write "<source>\ntype forward\n</source>" } # TODO
-    end
-    file
-  end
-
-  def plugin_dir
-    dir = File.join(root_dir, "fluentd", "plugins")
-    unless Dir.exist?(dir)
-      FileUtils.mkdir_p(dir)
-    end
-    dir
-  end
-
-  def options
-    # TODO: https://github.com/fluent/fluentd/pull/315
-    {
-      :config_path => Fluent::DEFAULT_CONFIG_PATH,
-      :plugin_dirs => [Fluent::DEFAULT_PLUGIN_DIR],
-      :log_level => Fluent::Log::LEVEL_INFO,
-      :log_path => nil,
-      :daemonize => false,
-      :libs => [],
-      :setup_path => nil,
-      :chuser => nil,
-      :chgroup => nil,
-      :suppress_interval => 0,
-      :suppress_repeated_stacktrace => false,
-      :use_v1_config => false,
-    }.merge({
-      :use_v1_config => true,
-      :plugin_dirs => [plugin_dir],
-      :config_path => config_file,
-      :daemonize => pid_file,
-      :log_path => log_file,
-      :log_level => Fluent::Log::LEVEL_INFO,
-    })
-  end
-
-  def running?
-    pid && system("/bin/kill -0 #{pid}", :out => File::NULL, :err => File::NULL)
+  def td_agent?
+    variant == "td-agent"
   end
 
   def start
-    return if running?
-    spawn("bundle exec fluentd #{options_to_argv(options)}") # TODO
+    agent.start
   end
 
   def stop
-    return unless running?
-    system("/bin/kill -TERM #{pid}")
-    File.unlink(pid_file)
+    agent.stop
+  end
+  
+  def reload
+    agent.reload
   end
 
-  def reload
-    return unless running?
-    system("/bin/kill -HUP #{pid}")
+  def running?
+    agent.running?
   end
 
   def log
-    File.read log_file # TODO: large log file
+    # File.read log_file # TODO: large log file
+    "log log"
   end
 
-  def config
-    ::Fluentd::Configuration.new(config_file)
+  def agent
+    klass = variant.underscore.camelize
+    @agent ||= Agent.const_get(klass).new({
+      :pid_file => pid_file,
+      :log_file => log_file,
+      :config_file => config_file,
+    })
   end
 
-  private
-
-  def options_to_argv(options)
-    argv = ""
-    argv << " --use-v1-config" if options[:use_v1_config]
-    argv << " -c #{options[:config_path]}" if options[:config_path].present?
-    argv << " -p #{options[:plugin_dir].first}" if options[:plugin_dir].present?
-    argv << " -d #{options[:daemonize]}" if options[:daemonize].present?
-    argv << " -o #{options[:log_path]}" if options[:log_path].present?
-    argv
+  def validate_permissions
+    %w(pid_file log_file config_file).each do |column|
+      path = send(column)
+      if File.exist?(path)
+        unless File.writable?(path)
+          errors.add(column, "#{path} fa")
+        end
+      else
+        unless File.world_writable?(File.dirname(path))
+          errors.add(column, "#{path} fa")
+        end
+      end
+    end
   end
 end
diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
new file mode 100644
index 0000000..7718079
--- /dev/null
+++ b/app/models/fluentd/agent.rb
@@ -0,0 +1,117 @@
+require 'fluent/log'
+require 'fluent/env'
+require 'fluent/version'
+require 'fluent/supervisor'
+
+class Fluentd
+  class Agent
+    class Base
+      attr_reader :extra_options
+
+      def initialize(options = {})
+        @extra_options = options
+      end
+
+      def pid
+        return unless File.exists?(pid_file)
+        File.read(pid_file)
+      end
+
+      def running?
+        pid && system("/bin/kill -0 #{pid}", :out => File::NULL, :err => File::NULL)
+      end
+
+      %w(pid_file log_file config_file start stop reload).each do |method|
+        define_method(method) do
+          raise NotImplementedError
+        end
+      end
+
+      # pidfile
+      #   td-agent: /var/run/td-agent/td-agent.pid
+      #   - https://github.com/treasure-data/td-agent/blob/master/td-agent.logrotate#L10
+      #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L25
+      #   fluentd:  nothing (or --daemon PIDFILE)
+      #
+      # logfile
+      #   td-agent: /var/log/td-agent/td-agent.log
+      #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L28
+      #   fluentd: stdout (or --log LOGFILE)
+      #
+      # config file
+      #   td-agent: /etc/td-agent/td-agent.conf
+      #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.postinst#L69
+      #   fluentd: /etc/fluent/fluent.conf (by fluentd -s)
+    end
+
+    class Fluentd < Base
+      def pid_file
+        extra_options[:pid_file] || "/var/run/fluent.pid"
+      end
+
+      def log_file
+        extra_options[:log_file] || "/var/log/fluent.log"
+      end
+
+      def config_file
+        extra_options[:config_file] || "/etc/fluent/fluent.conf"
+      end
+
+      def options_to_argv
+        argv = ""
+        argv << " --use-v1-config"
+        argv << " -c #{config_file}"
+        argv << " -d #{pid_file}"
+        argv << " -o #{log_file}"
+        argv
+      end
+
+      def start
+        return if running?
+        spawn("bundle exec fluentd #{options_to_argv}") # TODO
+      end
+
+      def stop
+        return unless running?
+        system("/bin/kill -TERM #{pid}")
+        File.unlink(pid_file)
+      end
+
+      def reload
+        return unless running?
+        system("/bin/kill -HUP #{pid}")
+      end
+    end
+
+    class TdAgent < Base
+      def pid_file
+        "/var/run/td-agent/td-agent.pid"
+      end
+
+      def log_file
+        "/var/log/td-agent/td-agent.log"
+      end
+
+      def config_file
+        "/etc/td-agent/td-agent.conf"
+      end
+
+      def start
+        system('/etc/init.d/td-agent start')
+      end
+
+      def stop
+        system('/etc/init.d/td-agent stop')
+      end
+
+      def reload
+        # NOTE: td-agent has no reload command
+        # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
+        system('/etc/init.d/td-agent restart')
+      end
+    end
+
+    class Remote < Base # TODO
+    end
+  end
+end
diff --git a/app/views/fluentd/daemons/show.html.haml b/app/views/fluentd/daemons/show.html.haml
index 9542817..5d06080 100644
--- a/app/views/fluentd/daemons/show.html.haml
+++ b/app/views/fluentd/daemons/show.html.haml
@@ -1,7 +1,7 @@
 %h1
   = @fluentd.running? ? "running" : "stopped"
 
-  = link_to "start", start_fluentd_daemon_path(id: 1), method: :put, remote: true
-  = link_to "stop", stop_fluentd_daemon_path(id: 1), method: :put, remote: true
-  = link_to "reload", reload_fluentd_daemon_path(id: 1), method: :put, remote: true
-  = link_to "log", log_fluentd_daemon_path(id: 1)
+  = link_to "start", start_fluentd_daemon_path(@fluentd), method: :put, remote: true
+  = link_to "stop", stop_fluentd_daemon_path(@fluentd), method: :put, remote: true
+  = link_to "reload", reload_fluentd_daemon_path(@fluentd), method: :put, remote: true
+  = link_to "log", log_fluentd_daemon_path(@fluentd)
diff --git a/app/views/fluentd/index.html.haml b/app/views/fluentd/index.html.haml
index 4c6c2ec..5f938c2 100644
--- a/app/views/fluentd/index.html.haml
+++ b/app/views/fluentd/index.html.haml
@@ -1,2 +1,2 @@
-- @daemons.each do |d|
-  = link_to d, fluentd_daemon_path(fluentd_id: 1) # TODO
+- @fluentds.each do |d|
+  = link_to d, fluentd_daemon_path(d) # TODO
diff --git a/db/migrate/20140522055753_create_fluentds.rb b/db/migrate/20140522055753_create_fluentds.rb
new file mode 100644
index 0000000..7c46301
--- /dev/null
+++ b/db/migrate/20140522055753_create_fluentds.rb
@@ -0,0 +1,12 @@
+class CreateFluentds < ActiveRecord::Migration
+  def change
+    create_table :fluentds do |t|
+      t.string :variant, null: false # fluentd, td-agent, or remote
+      t.string :pid_file
+      t.string :log_file
+      t.string :config_file
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bbe40f2..a8b2ba2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,16 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140522023140) do
+ActiveRecord::Schema.define(version: 20140522055753) do
+
+  create_table "fluentds", force: true do |t|
+    t.string   "variant",     null: false
+    t.string   "pid_file"
+    t.string   "log_file"
+    t.string   "config_file"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "login_tokens", force: true do |t|
     t.string   "token_id",   null: false
diff --git a/spec/models/fluentd_spec.rb b/spec/models/fluentd_spec.rb
new file mode 100644
index 0000000..a2876ac
--- /dev/null
+++ b/spec/models/fluentd_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Fluentd do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From dc36bd9e336c42c0b7a8e4904a61854594092dc3 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 15:56:01 +0900
Subject: [PATCH 03/22] Remove unnecessary method bridge

---
 app/controllers/fluentd/daemons_controller.rb |  8 ++++----
 app/models/fluentd.rb                         | 17 -----------------
 app/models/fluentd/agent.rb                   |  4 ++++
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/controllers/fluentd/daemons_controller.rb b/app/controllers/fluentd/daemons_controller.rb
index 56250e6..09ebdc8 100644
--- a/app/controllers/fluentd/daemons_controller.rb
+++ b/app/controllers/fluentd/daemons_controller.rb
@@ -6,22 +6,22 @@ class Fluentd::DaemonsController < ApplicationController
   end
 
   def start
-    fluentd.start
+    fluentd.agent.start
     render :show
   end
 
   def stop
-    fluentd.stop
+    fluentd.agent.stop
     render :show
   end
 
   def reload
-    fluentd.reload
+    fluentd.agent.reload
     render :show
   end
 
   def log
-    render text: fluentd.log, content_type: "text/plain"
+    render text: fluentd.agent.log, content_type: "text/plain"
   end
 
   private
diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb
index ef684a6..63fb660 100644
--- a/app/models/fluentd.rb
+++ b/app/models/fluentd.rb
@@ -9,27 +9,10 @@ class Fluentd < ActiveRecord::Base
     variant == "td-agent"
   end
 
-  def start
-    agent.start
-  end
-
-  def stop
-    agent.stop
-  end
-  
-  def reload
-    agent.reload
-  end
-
   def running?
     agent.running?
   end
 
-  def log
-    # File.read log_file # TODO: large log file
-    "log log"
-  end
-
   def agent
     klass = variant.underscore.camelize
     @agent ||= Agent.const_get(klass).new({
diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index 7718079..d225583 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -21,6 +21,10 @@ class Fluentd
         pid && system("/bin/kill -0 #{pid}", :out => File::NULL, :err => File::NULL)
       end
 
+      def log
+        File.read(log_file) # TODO
+      end
+
       %w(pid_file log_file config_file start stop reload).each do |method|
         define_method(method) do
           raise NotImplementedError

From 2c431b4eb6e5a1cad88bf121032016a2c394d881 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 16:11:25 +0900
Subject: [PATCH 04/22] Fix permission error messages

---
 app/models/fluentd.rb             | 7 +++++--
 config/locales/translation_ja.yml | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb
index 63fb660..559f074 100644
--- a/app/models/fluentd.rb
+++ b/app/models/fluentd.rb
@@ -27,11 +27,14 @@ class Fluentd < ActiveRecord::Base
       path = send(column)
       if File.exist?(path)
         unless File.writable?(path)
-          errors.add(column, "#{path} fa")
+          errors.add(column, :lack_write_permission)
+        end
+        unless File.readable?(path)
+          errors.add(column, :lack_read_permission)
         end
       else
         unless File.world_writable?(File.dirname(path))
-          errors.add(column, "#{path} fa")
+          errors.add(column, :lack_write_permission)
         end
       end
     end
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 40fbffd..0975622 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -66,6 +66,8 @@ ja:
     errors:
       messages:
           wrong_password: が違います
+          lack_read_permission: の読み込み権限がありません
+          lack_write_permission: の書き込み権限がありません
 
     models:
       user: user  #g
@@ -78,3 +80,7 @@ ja:
         current_password: 現在のパスワード
         password: パスワード
         password_confirmation: パスワード(確認)
+      fluentd:
+        log_file: ログファイル
+        pid_file: PIDファイル
+        config_file: 設定ファイル

From feb392cd753efbc0ae60346074ff1f892b27c1a1 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 16:25:41 +0900
Subject: [PATCH 05/22] trivial refactoring

---
 app/controllers/fluentd/daemons_controller.rb | 13 ++++++-------
 app/controllers/fluentd_controller.rb         |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/controllers/fluentd/daemons_controller.rb b/app/controllers/fluentd/daemons_controller.rb
index 09ebdc8..cf3c88e 100644
--- a/app/controllers/fluentd/daemons_controller.rb
+++ b/app/controllers/fluentd/daemons_controller.rb
@@ -1,32 +1,31 @@
 class Fluentd::DaemonsController < ApplicationController
-  before_action :login_required
-  before_action :fluentd
+  before_action :find_fluentd
 
   def show
   end
 
   def start
-    fluentd.agent.start
+    @fluentd.agent.start
     render :show
   end
 
   def stop
-    fluentd.agent.stop
+    @fluentd.agent.stop
     render :show
   end
 
   def reload
-    fluentd.agent.reload
+    @fluentd.agent.reload
     render :show
   end
 
   def log
-    render text: fluentd.agent.log, content_type: "text/plain"
+    render text: @fluentd.agent.log, content_type: "text/plain"
   end
 
   private
 
-  def fluentd
+  def find_fluentd
     @fluentd = Fluentd.find(params[:fluentd_id])
   end
 end
diff --git a/app/controllers/fluentd_controller.rb b/app/controllers/fluentd_controller.rb
index 306810e..2abe437 100644
--- a/app/controllers/fluentd_controller.rb
+++ b/app/controllers/fluentd_controller.rb
@@ -1,6 +1,4 @@
 class FluentdController < ApplicationController
-  before_action :login_required
-
   def index
     @fluentds = Fluentd.all
   end

From c23d5254b39798c3b390b46709e318b4af0b0e3e Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 17:24:27 +0900
Subject: [PATCH 06/22] Add Fluentd CRUD

---
 app/controllers/fluentd_controller.rb | 42 +++++++++++++++++++++++
 app/models/fluentd.rb                 | 21 ++++++++++++
 app/models/fluentd/agent.rb           | 48 +++++++++++++--------------
 app/views/fluentd/_form.html.haml     | 18 ++++++++++
 app/views/fluentd/edit.html.haml      |  3 ++
 app/views/fluentd/index.html.haml     | 13 +++++++-
 app/views/fluentd/new.html.haml       |  3 ++
 config/locales/translation_ja.yml     | 22 ++++++++++++
 config/routes.rb                      |  2 +-
 9 files changed, 146 insertions(+), 26 deletions(-)
 create mode 100644 app/views/fluentd/_form.html.haml
 create mode 100644 app/views/fluentd/edit.html.haml
 create mode 100644 app/views/fluentd/new.html.haml

diff --git a/app/controllers/fluentd_controller.rb b/app/controllers/fluentd_controller.rb
index 2abe437..dbad858 100644
--- a/app/controllers/fluentd_controller.rb
+++ b/app/controllers/fluentd_controller.rb
@@ -1,5 +1,47 @@
 class FluentdController < ApplicationController
+  before_action :find_fluentd, only: [:edit, :update, :destroy]
+
   def index
     @fluentds = Fluentd.all
   end
+
+  def new
+    @fluentd = Fluentd.new(Fluentd::Agent::Fluentd::DEFAULT_OPTIONS) # TODO: not fluentd type
+  end
+
+  def create
+    @fluentd = Fluentd.new(fluentd_params)
+    unless @fluentd.save
+      return render :new
+    end
+    redirect_to fluentd_index_path
+  end
+
+  def edit
+  end
+
+  def update
+    # TODO: should restart if changed file path? or just do "dirty" flagged?
+    @fluentd.update_attributes(fluentd_params)
+    unless @fluentd.save
+      return render :edit
+    end
+    redirect_to fluentd_index_path
+  end
+  
+  def destroy
+    @fluentd.agent.stop if @fluentd.agent.running?
+    @fluentd.destroy
+    redirect_to fluentd_index_path
+  end
+
+  private
+
+  def find_fluentd
+    @fluentd = Fluentd.find(params[:id])
+  end
+
+  def fluentd_params
+    params.require(:fluentd).permit(:log_file, :pid_file, :config_file, :variant)
+  end
 end
diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb
index 559f074..0123d7d 100644
--- a/app/models/fluentd.rb
+++ b/app/models/fluentd.rb
@@ -1,6 +1,15 @@
 class Fluentd < ActiveRecord::Base
+  before_validation :expand_paths
+  validates :variant, inclusion: { in: proc { Fluentd.variants } }
+  validates :log_file, presence: true
+  validates :pid_file, presence: true
+  validates :config_file, presence: true
   validate :validate_permissions
 
+  def self.variants
+    %w(fluentd) # TODO:
+  end
+
   def fluentd?
     variant == "fluentd"
   end
@@ -22,10 +31,22 @@ class Fluentd < ActiveRecord::Base
     })
   end
 
+  def expand_paths
+    %w(pid_file log_file config_file).each do |column|
+      self.send("#{column}=", File.expand_path(send(column)))
+    end
+  end
+
   def validate_permissions
     %w(pid_file log_file config_file).each do |column|
       path = send(column)
+      next if path.empty? # if empty, presence: true will catch it
+
       if File.exist?(path)
+        if File.directory?(path)
+          errors.add(column, :is_a_directory)
+        end
+
         unless File.writable?(path)
           errors.add(column, :lack_write_permission)
         end
diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index d225583..63eb79a 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -22,10 +22,22 @@ class Fluentd
       end
 
       def log
-        File.read(log_file) # TODO
+        File.read(log_file) # TODO: large log file
       end
 
-      %w(pid_file log_file config_file start stop reload).each do |method|
+      def pid_file
+        extra_options[:pid_file] || DEFAULT_OPTIONS[:pid_file]
+      end
+
+      def log_file
+        extra_options[:log_file] || DEFAULT_OPTIONS[:pid_file]
+      end
+
+      def config_file
+        extra_options[:config_file] || DEFAULT_OPTIONS[:pid_file]
+      end
+
+      %w(start stop reload).each do |method|
         define_method(method) do
           raise NotImplementedError
         end
@@ -49,17 +61,11 @@ class Fluentd
     end
 
     class Fluentd < Base
-      def pid_file
-        extra_options[:pid_file] || "/var/run/fluent.pid"
-      end
-
-      def log_file
-        extra_options[:log_file] || "/var/log/fluent.log"
-      end
-
-      def config_file
-        extra_options[:config_file] || "/etc/fluent/fluent.conf"
-      end
+      DEFAULT_OPTIONS = {
+        :pid_file => "/var/run/fluent.pid",
+        :log_file => "/var/log/fluent.log",
+        :config_file => "/etc/fluent/fluent.conf",
+      }
 
       def options_to_argv
         argv = ""
@@ -88,17 +94,11 @@ class Fluentd
     end
 
     class TdAgent < Base
-      def pid_file
-        "/var/run/td-agent/td-agent.pid"
-      end
-
-      def log_file
-        "/var/log/td-agent/td-agent.log"
-      end
-
-      def config_file
-        "/etc/td-agent/td-agent.conf"
-      end
+      DEFAULT_OPTIONS = {
+        :pid_file => "/var/run/td-agent/td-agent.pid",
+        :log_file => "/var/log/td-agent/td-agent.log",
+        :config_file => "/etc/td-agent/td-agent.conf",
+      }
 
       def start
         system('/etc/init.d/td-agent start')
diff --git a/app/views/fluentd/_form.html.haml b/app/views/fluentd/_form.html.haml
new file mode 100644
index 0000000..b266e65
--- /dev/null
+++ b/app/views/fluentd/_form.html.haml
@@ -0,0 +1,18 @@
+%div.col-lg-6
+  - @fluentd.errors.full_messages.each do |e|
+    %div.alert.alert-danger= e
+
+  = form_for(:fluentd, url: url, method: method) do |f|
+    %div.form-group
+      = f.label :variant
+      = f.select :variant, Fluentd.variants
+    %div.form-group
+      = f.label :pid_file
+      = f.text_field :pid_file, class: "form-control"
+    %div.form-group
+      = f.label :log_file
+      = f.text_field :log_file, class: "form-control"
+    %div.form-group
+      = f.label :config_file
+      = f.text_field :config_file, class: "form-control"
+    = f.submit btn, class: "btn btn-primary"
diff --git a/app/views/fluentd/edit.html.haml b/app/views/fluentd/edit.html.haml
new file mode 100644
index 0000000..3a1facb
--- /dev/null
+++ b/app/views/fluentd/edit.html.haml
@@ -0,0 +1,3 @@
+- page_title t('.page_title')
+
+= render partial: "form", locals: { btn: t(".update"), url: fluentd_path(@fluentd), method: :patch }
diff --git a/app/views/fluentd/index.html.haml b/app/views/fluentd/index.html.haml
index 5f938c2..c078f03 100644
--- a/app/views/fluentd/index.html.haml
+++ b/app/views/fluentd/index.html.haml
@@ -1,2 +1,13 @@
+- page_title t('.page_title')
+
+%p= link_to t(".new"), new_fluentd_path
+
 - @fluentds.each do |d|
-  = link_to d, fluentd_daemon_path(d) # TODO
+  %div.col-lg-6
+    %div.panel.panel-default
+      %div.panel-heading
+        %h4= d.inspect
+      %div.panel-body
+        = link_to d, fluentd_daemon_path(d) # TODO
+        = link_to t(".edit"), edit_fluentd_path(d)
+        = link_to t(".destroy"), fluentd_path(d), method: :delete
diff --git a/app/views/fluentd/new.html.haml b/app/views/fluentd/new.html.haml
new file mode 100644
index 0000000..95c4d3a
--- /dev/null
+++ b/app/views/fluentd/new.html.haml
@@ -0,0 +1,3 @@
+- page_title t('.page_title')
+
+= render partial: "form", locals: { btn: t(".create"), url: fluentd_index_path, method: :post }
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 0975622..bce32c1 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -16,6 +16,11 @@ ja:
     fluent_version: "fluentd %{version}"
     no_alert: なし
     update_password: パスワード更新
+    create: 作成
+    update: 更新
+    edit: 編集
+    destroy: 削除
+    new: 新規作成
 
   plugins:
     common: &plugin_common
@@ -45,6 +50,21 @@ ja:
       <<: *terms
       page_title: ユーザー管理
 
+  fluentd: &fluentd
+    common: &fluentd_common
+      <<: *terms
+    form:
+      <<: *fluentd_common
+    index:
+      <<: *fluentd_common
+      page_title: fluentd
+    new:
+      <<: *fluentd_common
+      page_title: fluentd | 追加
+    edit:
+      <<: *fluentd_common
+      page_title: fluentd | 編集
+
   misc:
     common: &misc_common
       <<: *terms
@@ -68,6 +88,7 @@ ja:
           wrong_password: が違います
           lack_read_permission: の読み込み権限がありません
           lack_write_permission: の書き込み権限がありません
+          is_a_directory: はディレクトリです。ファイルを指定してください
 
     models:
       user: user  #g
@@ -84,3 +105,4 @@ ja:
         log_file: ログファイル
         pid_file: PIDファイル
         config_file: 設定ファイル
+        variant: タイプ
diff --git a/config/routes.rb b/config/routes.rb
index b41c889..78077d5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   root "fluentd#index" # TODO: change to dashboard
 
-  resources :fluentd, only: [:index] do
+  resources :fluentd do
     resource :daemon, only: [:show], module: :fluentd do
       put "start"
       put "stop"

From 5a4fd2b791c3e31af7efe8e3874543a054dbd747 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 17:48:05 +0900
Subject: [PATCH 07/22] Add i18n

---
 app/views/fluentd/daemons/show.html.haml | 11 ++++++-----
 config/locales/translation_ja.yml        |  9 +++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/views/fluentd/daemons/show.html.haml b/app/views/fluentd/daemons/show.html.haml
index 5d06080..3e1677a 100644
--- a/app/views/fluentd/daemons/show.html.haml
+++ b/app/views/fluentd/daemons/show.html.haml
@@ -1,7 +1,8 @@
 %h1
-  = @fluentd.running? ? "running" : "stopped"
+  = @fluentd.inspect
+  = @fluentd.running? ? t(".running") : t(".stopped")
 
-  = link_to "start", start_fluentd_daemon_path(@fluentd), method: :put, remote: true
-  = link_to "stop", stop_fluentd_daemon_path(@fluentd), method: :put, remote: true
-  = link_to "reload", reload_fluentd_daemon_path(@fluentd), method: :put, remote: true
-  = link_to "log", log_fluentd_daemon_path(@fluentd)
+= link_to t(".start"), start_fluentd_daemon_path(@fluentd), method: :put, remote: true
+= link_to t(".stop"), stop_fluentd_daemon_path(@fluentd), method: :put, remote: true
+= link_to t(".reload"), reload_fluentd_daemon_path(@fluentd), method: :put, remote: true
+= link_to t(".log"), log_fluentd_daemon_path(@fluentd)
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index bce32c1..5085b80 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -53,6 +53,12 @@ ja:
   fluentd: &fluentd
     common: &fluentd_common
       <<: *terms
+      start: 開始
+      stop: 停止
+      reload: リロード
+      log: ログ
+      stopped: 停止中
+      running: 稼働中
     form:
       <<: *fluentd_common
     index:
@@ -64,6 +70,9 @@ ja:
     edit:
       <<: *fluentd_common
       page_title: fluentd | 編集
+    daemons:
+      show:
+        <<: *fluentd_common
 
   misc:
     common: &misc_common

From 3034a42d9b462d4dc0687217eddcf42a193e87b4 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 18:04:53 +0900
Subject: [PATCH 08/22] Styling

---
 app/views/fluentd/daemons/show.html.haml |  5 +++--
 app/views/fluentd/index.html.haml        | 11 ++++++-----
 app/views/shared/_global_nav.html.erb    |  8 ++++++++
 config/locales/translation_ja.yml        |  2 ++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/views/fluentd/daemons/show.html.haml b/app/views/fluentd/daemons/show.html.haml
index 3e1677a..a863c1e 100644
--- a/app/views/fluentd/daemons/show.html.haml
+++ b/app/views/fluentd/daemons/show.html.haml
@@ -1,5 +1,6 @@
-%h1
-  = @fluentd.inspect
+- page_title t('.page_title', label: "##{@fluentd.id}")
+
+%h4
   = @fluentd.running? ? t(".running") : t(".stopped")
 
 = link_to t(".start"), start_fluentd_daemon_path(@fluentd), method: :put, remote: true
diff --git a/app/views/fluentd/index.html.haml b/app/views/fluentd/index.html.haml
index c078f03..0b52820 100644
--- a/app/views/fluentd/index.html.haml
+++ b/app/views/fluentd/index.html.haml
@@ -1,13 +1,14 @@
 - page_title t('.page_title')
 
-%p= link_to t(".new"), new_fluentd_path
+%p= link_to icon('fa-plus') << " " << t(".new"), new_fluentd_path
 
 - @fluentds.each do |d|
   %div.col-lg-6
     %div.panel.panel-default
       %div.panel-heading
-        %h4= d.inspect
+        %h4
+          = "fluentd ##{d.id}"
+          = link_to t(".edit"), edit_fluentd_path(d)
+          = link_to t(".destroy"), fluentd_path(d), method: :delete
       %div.panel-body
-        = link_to d, fluentd_daemon_path(d) # TODO
-        = link_to t(".edit"), edit_fluentd_path(d)
-        = link_to t(".destroy"), fluentd_path(d), method: :delete
+        = link_to t(".operation"), fluentd_daemon_path(d) # TODO
diff --git a/app/views/shared/_global_nav.html.erb b/app/views/shared/_global_nav.html.erb
index fb03829..f68fab9 100644
--- a/app/views/shared/_global_nav.html.erb
+++ b/app/views/shared/_global_nav.html.erb
@@ -2,6 +2,14 @@
   <li>
     <%= link_to_other icon("fa-dashboard fa-fw") << " Dashboard", root_path %>
   </li>
+  <li>
+    <%= link_to_other icon("fa-puzzle-piece fa-fw") << " fluentd", fluentd_index_path %>
+    <ul class="nav nav-second-level">
+      <li>
+        <%= link_to_other t("terms.new"), new_fluentd_path %>
+      </li>
+    </ul>
+  </li>
   <li>
     <%= link_to_other icon("fa-cogs fa-fw") << " " << t('terms.plugins') << icon('fa pull-right fa-caret-down'), plugins_path %>
     <ul class="nav nav-second-level">
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 5085b80..76bafc3 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -59,6 +59,7 @@ ja:
       log: ログ
       stopped: 停止中
       running: 稼働中
+      operation: プロセス詳細
     form:
       <<: *fluentd_common
     index:
@@ -73,6 +74,7 @@ ja:
     daemons:
       show:
         <<: *fluentd_common
+        page_title: "fluentd %{label}"
 
   misc:
     common: &misc_common

From d1b669cc4fdf194c5d22273c9155560027663bd2 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 18:11:34 +0900
Subject: [PATCH 09/22] [try] fix spec on Circle CI.....

---
 app/models/plugin.rb | 1 +
 spec/spec_helper.rb  | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/plugin.rb b/app/models/plugin.rb
index a975f5a..6a172e0 100644
--- a/app/models/plugin.rb
+++ b/app/models/plugin.rb
@@ -86,6 +86,7 @@ class Plugin
   end
 
   def self.installed
+    return [] unless File.exist?(gemfile_path)
     File.read(gemfile_path).scan(/"(.*?)", "(.*?)"/).map do |plugin|
       new(gem_name: plugin[0], version: plugin[1])
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4dbd29c..9bd0a3b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -64,12 +64,4 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean
   end
-
-  config.before(:each) do
-    system('sync') if ENV["CIRCLECI"] # file operations are unstable on Circle CI
-  end
-
-  config.after(:each) do
-    system('sync') if ENV["CIRCLECI"] # file operations are unstable on Circle CI
-  end
 end

From e29d0e31c324638d8d534ff1e482f9d9b115063b Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:09:01 +0900
Subject: [PATCH 10/22] Enhance model spec

---
 app/models/fluentd.rb                    |  43 ++++----
 app/models/fluentd/agent.rb              |  30 +++---
 app/views/fluentd/daemons/show.html.haml |   2 +-
 spec/factories/fluentd.rb                |   8 ++
 spec/helpers/miscs_helper_spec.rb        |  15 ---
 spec/models/fluentd/agent_spec.rb        |  55 ++++++++++
 spec/models/fluentd_spec.rb              | 124 ++++++++++++++++++++++-
 7 files changed, 226 insertions(+), 51 deletions(-)
 create mode 100644 spec/factories/fluentd.rb
 delete mode 100644 spec/helpers/miscs_helper_spec.rb
 create mode 100644 spec/models/fluentd/agent_spec.rb

diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb
index 0123d7d..3b113d2 100644
--- a/app/models/fluentd.rb
+++ b/app/models/fluentd.rb
@@ -18,10 +18,6 @@ class Fluentd < ActiveRecord::Base
     variant == "td-agent"
   end
 
-  def running?
-    agent.running?
-  end
-
   def agent
     klass = variant.underscore.camelize
     @agent ||= Agent.const_get(klass).new({
@@ -33,30 +29,35 @@ class Fluentd < ActiveRecord::Base
 
   def expand_paths
     %w(pid_file log_file config_file).each do |column|
-      self.send("#{column}=", File.expand_path(send(column)))
+      path = send(column)
+      next if path.blank?
+      self.send("#{column}=", File.expand_path(path))
     end
   end
 
   def validate_permissions
     %w(pid_file log_file config_file).each do |column|
-      path = send(column)
-      next if path.empty? # if empty, presence: true will catch it
+      check_permission(column)
+    end
+  end
 
-      if File.exist?(path)
-        if File.directory?(path)
-          errors.add(column, :is_a_directory)
-        end
+  def check_permission(column)
+    path = send(column)
+    return if path.blank? # if empty, presence: true will catch it
+    if File.exist?(path)
+      if File.directory?(path)
+        errors.add(column, :is_a_directory)
+      end
 
-        unless File.writable?(path)
-          errors.add(column, :lack_write_permission)
-        end
-        unless File.readable?(path)
-          errors.add(column, :lack_read_permission)
-        end
-      else
-        unless File.world_writable?(File.dirname(path))
-          errors.add(column, :lack_write_permission)
-        end
+      unless File.writable?(path)
+        errors.add(column, :lack_write_permission)
+      end
+      unless File.readable?(path)
+        errors.add(column, :lack_read_permission)
+      end
+    else
+      unless File.writable?(File.dirname(path))
+        errors.add(column, :lack_write_permission)
       end
     end
   end
diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index 63eb79a..a656e10 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -26,15 +26,15 @@ class Fluentd
       end
 
       def pid_file
-        extra_options[:pid_file] || DEFAULT_OPTIONS[:pid_file]
+        extra_options[:pid_file] || self.class.default_options[:pid_file]
       end
 
       def log_file
-        extra_options[:log_file] || DEFAULT_OPTIONS[:pid_file]
+        extra_options[:log_file] || self.class.default_options[:log_file]
       end
 
       def config_file
-        extra_options[:config_file] || DEFAULT_OPTIONS[:pid_file]
+        extra_options[:config_file] || self.class.default_options[:config_file]
       end
 
       %w(start stop reload).each do |method|
@@ -61,11 +61,13 @@ class Fluentd
     end
 
     class Fluentd < Base
-      DEFAULT_OPTIONS = {
-        :pid_file => "/var/run/fluent.pid",
-        :log_file => "/var/log/fluent.log",
-        :config_file => "/etc/fluent/fluent.conf",
-      }
+      def self.default_options
+        {
+          :pid_file => "/var/run/fluent.pid",
+          :log_file => "/var/log/fluent.log",
+          :config_file => "/etc/fluent/fluent.conf",
+        }
+      end
 
       def options_to_argv
         argv = ""
@@ -94,11 +96,13 @@ class Fluentd
     end
 
     class TdAgent < Base
-      DEFAULT_OPTIONS = {
-        :pid_file => "/var/run/td-agent/td-agent.pid",
-        :log_file => "/var/log/td-agent/td-agent.log",
-        :config_file => "/etc/td-agent/td-agent.conf",
-      }
+      def self.default_options
+        {
+          :pid_file => "/var/run/td-agent/td-agent.pid",
+          :log_file => "/var/log/td-agent/td-agent.log",
+          :config_file => "/etc/td-agent/td-agent.conf",
+        }
+      end
 
       def start
         system('/etc/init.d/td-agent start')
diff --git a/app/views/fluentd/daemons/show.html.haml b/app/views/fluentd/daemons/show.html.haml
index a863c1e..8167b61 100644
--- a/app/views/fluentd/daemons/show.html.haml
+++ b/app/views/fluentd/daemons/show.html.haml
@@ -1,7 +1,7 @@
 - page_title t('.page_title', label: "##{@fluentd.id}")
 
 %h4
-  = @fluentd.running? ? t(".running") : t(".stopped")
+  = @fluentd.agent.running? ? t(".running") : t(".stopped")
 
 = link_to t(".start"), start_fluentd_daemon_path(@fluentd), method: :put, remote: true
 = link_to t(".stop"), stop_fluentd_daemon_path(@fluentd), method: :put, remote: true
diff --git a/spec/factories/fluentd.rb b/spec/factories/fluentd.rb
new file mode 100644
index 0000000..5ec7b8f
--- /dev/null
+++ b/spec/factories/fluentd.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :fluentd do
+    variant "fluentd"
+    log_file (Rails.root + "tmp/fluentd-test/fluentd.log").to_s
+    pid_file (Rails.root + "tmp/fluentd-test/fluentd.pid").to_s
+    config_file (Rails.root + "tmp/fluentd-test/fluentd.conf").to_s
+  end
+end
diff --git a/spec/helpers/miscs_helper_spec.rb b/spec/helpers/miscs_helper_spec.rb
deleted file mode 100644
index 1b87fd3..0000000
--- a/spec/helpers/miscs_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the MiscsHelper. For example:
-#
-# describe MiscsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-describe MiscsHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/fluentd/agent_spec.rb b/spec/models/fluentd/agent_spec.rb
new file mode 100644
index 0000000..6ca743a
--- /dev/null
+++ b/spec/models/fluentd/agent_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Fluentd::Agent do
+  shared_examples_for "Agent has common behavior" do |klass|
+    describe "#extra_options" do
+      context "blank" do
+        let(:options) { {} }
+        it { instance.pid_file.should    == described_class.default_options[:pid_file] }
+        it { instance.log_file.should    == described_class.default_options[:log_file] }
+        it { instance.config_file.should == described_class.default_options[:config_file] }
+      end
+
+      context "given" do
+        let(:options) do
+          {
+            :pid_file => pid_file,
+            :log_file => log_file,
+            :config_file => config_file,
+          }
+        end
+        let(:pid_file) { "pid" }
+        let(:log_file) { "log" }
+        let(:config_file) { "config" }
+
+        it { instance.pid_file.should == pid_file }
+        it { instance.log_file.should == log_file }
+        it { instance.config_file.should == config_file }
+      end
+    end
+  end
+
+  let(:instance) { described_class.new(options) }
+  let(:options) { {} }
+
+  describe "Fluentd" do
+    let(:described_class) { Fluentd::Agent::Fluentd } # override nested described_class behavior as https://github.com/rspec/rspec-core/issues/1114
+
+    it_should_behave_like "Agent has common behavior"
+
+    describe "#options_to_argv" do
+      subject { instance.options_to_argv }
+      it { should include("-c #{instance.config_file}") }
+      it { should include("-d #{instance.pid_file}") }
+      it { should include("-o #{instance.log_file}") }
+      it { should include("--use-v1-config") }
+    end
+  end
+
+  describe "TdAgent" do
+    let(:described_class) { Fluentd::Agent::TdAgent } # override nested described_class behavior as https://github.com/rspec/rspec-core/issues/1114
+
+    it_should_behave_like "Agent has common behavior"
+  end
+end
+
diff --git a/spec/models/fluentd_spec.rb b/spec/models/fluentd_spec.rb
index a2876ac..5133ff7 100644
--- a/spec/models/fluentd_spec.rb
+++ b/spec/models/fluentd_spec.rb
@@ -1,5 +1,127 @@
 require 'spec_helper'
 
 describe Fluentd do
-  pending "add some examples to (or delete) #{__FILE__}"
+  shared_examples_for "path permission" do |column|
+    let(:path) { fluentd.send(column) }
+
+    subject do
+      fluentd.check_permission(column) 
+      fluentd.errors
+    end
+
+    context "file exists" do
+      before { FileUtils.touch(path) }
+      after { FileUtils.chmod(0755, path) }
+
+      context "writable" do
+        before { FileUtils.chmod(0600, path) }
+        it { should be_blank }
+      end
+
+      context "not writable" do
+        before { FileUtils.chmod(0400, path) }
+        it { should_not be_blank }
+        it { subject.get(column).should include(I18n.t('activerecord.errors.messages.lack_write_permission')) }
+      end
+
+      context "not readable" do
+        before { FileUtils.chmod(0200, path) }
+        it { should_not be_blank }
+        it { subject.get(column).should include(I18n.t('activerecord.errors.messages.lack_read_permission')) }
+      end
+
+      context "is directory" do
+        before { fluentd.send("#{column}=", Rails.root + "tmp") }
+        it { should_not be_blank }
+        it { subject.get(column).should include(I18n.t('activerecord.errors.messages.is_a_directory')) }
+      end
+    end
+
+    context "file not exists" do
+      let(:dir) { File.dirname(path) }
+      before { FileUtils.rm path }
+      after { FileUtils.chmod_R(0755, dir) }
+
+      context "writable" do
+        before { FileUtils.chmod(0700, dir) }
+        it { should be_blank }
+      end
+
+      context "not writable" do
+        before { FileUtils.chmod(0500, dir) }
+        it { should_not be_blank }
+        it { subject.get(column).should include(I18n.t('activerecord.errors.messages.lack_write_permission')) }
+      end
+    end
+  end
+
+  let(:fluentd) { FactoryGirl.build(:fluentd) }
+
+  describe "#valid?" do
+    before do
+      %w(pid_file log_file config_file).each do |column|
+        FileUtils.mkdir_p File.dirname(fluentd.send(column))
+        FileUtils.touch fluentd.send(column)
+      end
+    end
+
+    subject { fluentd }
+
+    describe "variant" do
+      before { fluentd.variant = variant }
+
+      context "fluentd" do
+        let(:variant) { "fluentd" }
+        it { should be_valid }
+      end
+
+      context "foobar (not declared in Fluentd.variants)" do
+        let(:variant) { "foobar" }
+        it { should_not be_valid }
+      end
+    end
+
+    describe "pid_file" do
+      it_should_behave_like "path permission", :pid_file
+    end
+
+    describe "log_file" do
+      it_should_behave_like "path permission", :log_file
+    end
+
+    describe "config_file" do
+      it_should_behave_like "path permission", :config_file
+    end
+  end
+
+  describe "variant" do
+    before { fluentd.variant = variant }
+
+    context "= fluentd" do
+      let(:variant) { "fluentd" }
+      it { fluentd.should be_fluentd }
+      it { fluentd.should_not be_td_agent }
+    end
+
+    context "= td-agent" do
+      let(:variant) { "td-agent" }
+      it { fluentd.should_not be_fluentd }
+      it { fluentd.should be_td_agent }
+    end
+  end
+
+  describe "#agent" do
+    before { fluentd.variant = variant }
+    subject { fluentd.agent }
+
+    context "fluentd" do
+      let(:variant) { "fluentd" }
+      it { should be_instance_of(Fluentd::Agent::Fluentd) }
+    end
+
+    context "td-agent" do
+      let(:variant) { "td-agent" }
+      it { should be_instance_of(Fluentd::Agent::TdAgent) }
+    end
+  end
 end

From 9b109dffffcee2489e2880ece97c513d4088bf3a Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:11:22 +0900
Subject: [PATCH 11/22] quiet a warning: WARN: tilt autoloading 'sass' in a non
 thread-safe way; explicit require 'sass' suggested.

---
 config/application.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/application.rb b/config/application.rb
index 39cfad9..3af0a38 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,6 +13,7 @@ require "sprockets/railtie"
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 # these gems are not required by Bundler.require
+require "sass"
 require "haml-rails"
 require "jquery-rails"
 require "sucker_punch"

From 92b42c51b76a452a34fbaa9dfcc6ac2cab3a37b0 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:24:08 +0900
Subject: [PATCH 12/22] Rename: fluentd/daemon -> fluentd/agent

---
 .../{daemons_controller.rb => agents_controller.rb}      | 2 +-
 app/helpers/fluentd/daemons_helper.rb                    | 2 --
 app/views/fluentd/agents/show.html.haml                  | 9 +++++++++
 app/views/fluentd/daemons/show.html.haml                 | 9 ---------
 app/views/fluentd/index.html.haml                        | 2 +-
 config/locales/translation_ja.yml                        | 2 +-
 config/routes.rb                                         | 2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)
 rename app/controllers/fluentd/{daemons_controller.rb => agents_controller.rb} (87%)
 delete mode 100644 app/helpers/fluentd/daemons_helper.rb
 create mode 100644 app/views/fluentd/agents/show.html.haml
 delete mode 100644 app/views/fluentd/daemons/show.html.haml

diff --git a/app/controllers/fluentd/daemons_controller.rb b/app/controllers/fluentd/agents_controller.rb
similarity index 87%
rename from app/controllers/fluentd/daemons_controller.rb
rename to app/controllers/fluentd/agents_controller.rb
index cf3c88e..2f46627 100644
--- a/app/controllers/fluentd/daemons_controller.rb
+++ b/app/controllers/fluentd/agents_controller.rb
@@ -1,4 +1,4 @@
-class Fluentd::DaemonsController < ApplicationController
+class Fluentd::AgentsController < ApplicationController
   before_action :find_fluentd
 
   def show
diff --git a/app/helpers/fluentd/daemons_helper.rb b/app/helpers/fluentd/daemons_helper.rb
deleted file mode 100644
index 977e042..0000000
--- a/app/helpers/fluentd/daemons_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Fluentd::DaemonsHelper
-end
diff --git a/app/views/fluentd/agents/show.html.haml b/app/views/fluentd/agents/show.html.haml
new file mode 100644
index 0000000..d964f0b
--- /dev/null
+++ b/app/views/fluentd/agents/show.html.haml
@@ -0,0 +1,9 @@
+- page_title t('.page_title', label: "##{@fluentd.id}")
+
+%h4
+  = @fluentd.agent.running? ? t(".running") : t(".stopped")
+
+= link_to t(".start"), start_fluentd_agent_path(@fluentd), method: :put, remote: true
+= link_to t(".stop"), stop_fluentd_agent_path(@fluentd), method: :put, remote: true
+= link_to t(".reload"), reload_fluentd_agent_path(@fluentd), method: :put, remote: true
+= link_to t(".log"), log_fluentd_agent_path(@fluentd)
diff --git a/app/views/fluentd/daemons/show.html.haml b/app/views/fluentd/daemons/show.html.haml
deleted file mode 100644
index 8167b61..0000000
--- a/app/views/fluentd/daemons/show.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-- page_title t('.page_title', label: "##{@fluentd.id}")
-
-%h4
-  = @fluentd.agent.running? ? t(".running") : t(".stopped")
-
-= link_to t(".start"), start_fluentd_daemon_path(@fluentd), method: :put, remote: true
-= link_to t(".stop"), stop_fluentd_daemon_path(@fluentd), method: :put, remote: true
-= link_to t(".reload"), reload_fluentd_daemon_path(@fluentd), method: :put, remote: true
-= link_to t(".log"), log_fluentd_daemon_path(@fluentd)
diff --git a/app/views/fluentd/index.html.haml b/app/views/fluentd/index.html.haml
index 0b52820..45d7517 100644
--- a/app/views/fluentd/index.html.haml
+++ b/app/views/fluentd/index.html.haml
@@ -11,4 +11,4 @@
           = link_to t(".edit"), edit_fluentd_path(d)
           = link_to t(".destroy"), fluentd_path(d), method: :delete
       %div.panel-body
-        = link_to t(".operation"), fluentd_daemon_path(d) # TODO
+        = link_to t(".operation"), fluentd_agent_path(d) # TODO
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 76bafc3..3c58cda 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -71,7 +71,7 @@ ja:
     edit:
       <<: *fluentd_common
       page_title: fluentd | 編集
-    daemons:
+    agents:
       show:
         <<: *fluentd_common
         page_title: "fluentd %{label}"
diff --git a/config/routes.rb b/config/routes.rb
index 78077d5..fe346ef 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@ Rails.application.routes.draw do
   root "fluentd#index" # TODO: change to dashboard
 
   resources :fluentd do
-    resource :daemon, only: [:show], module: :fluentd do
+    resource :agent, only: [:show], module: :fluentd do
       put "start"
       put "stop"
       put "reload"

From 94a26c98d60320fc7427587a4398a0e9b8153ac1 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:51:17 +0900
Subject: [PATCH 13/22] Click start/stop/reload to be sync, not async for
 correct report running status

---
 app/controllers/fluentd/agents_controller.rb | 6 +++---
 app/views/fluentd/agents/show.html.haml      | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/fluentd/agents_controller.rb b/app/controllers/fluentd/agents_controller.rb
index 2f46627..bd3adb8 100644
--- a/app/controllers/fluentd/agents_controller.rb
+++ b/app/controllers/fluentd/agents_controller.rb
@@ -6,17 +6,17 @@ class Fluentd::AgentsController < ApplicationController
 
   def start
     @fluentd.agent.start
-    render :show
+    redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def stop
     @fluentd.agent.stop
-    render :show
+    redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def reload
     @fluentd.agent.reload
-    render :show
+    redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def log
diff --git a/app/views/fluentd/agents/show.html.haml b/app/views/fluentd/agents/show.html.haml
index d964f0b..b2ffc77 100644
--- a/app/views/fluentd/agents/show.html.haml
+++ b/app/views/fluentd/agents/show.html.haml
@@ -3,7 +3,8 @@
 %h4
   = @fluentd.agent.running? ? t(".running") : t(".stopped")
 
-= link_to t(".start"), start_fluentd_agent_path(@fluentd), method: :put, remote: true
-= link_to t(".stop"), stop_fluentd_agent_path(@fluentd), method: :put, remote: true
-= link_to t(".reload"), reload_fluentd_agent_path(@fluentd), method: :put, remote: true
+= link_to t(".start"), start_fluentd_agent_path(@fluentd), method: :put
+= link_to t(".stop"), stop_fluentd_agent_path(@fluentd), method: :put
+= link_to t(".reload"), reload_fluentd_agent_path(@fluentd), method: :put
 = link_to t(".log"), log_fluentd_agent_path(@fluentd)
+TODO: config

From 22d65e0f922cce2133e143cd61d96f0971fd3bfa Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:52:03 +0900
Subject: [PATCH 14/22] Wait starting fluentd process in #start

---
 app/models/fluentd/agent.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index a656e10..fb9aba9 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -14,7 +14,7 @@ class Fluentd
 
       def pid
         return unless File.exists?(pid_file)
-        File.read(pid_file)
+        File.read(pid_file).to_i rescue nil
       end
 
       def running?
@@ -80,7 +80,13 @@ class Fluentd
 
       def start
         return if running?
-        spawn("bundle exec fluentd #{options_to_argv}") # TODO
+        spawn("bundle exec fluentd #{options_to_argv}")
+        timeout(5) do # TODO: decide how long wait
+          loop do
+            break if pid && Process.kill(0, pid)
+            sleep 0.01
+          end
+        end
       end
 
       def stop

From e118e0997af55192eec6e6bf891b3a5a53b4a2cf Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:52:49 +0900
Subject: [PATCH 15/22] Refactoring: use Process.kill instead /bin/kill

---
 app/models/fluentd/agent.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index fb9aba9..25c46b0 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -18,7 +18,7 @@ class Fluentd
       end
 
       def running?
-        pid && system("/bin/kill -0 #{pid}", :out => File::NULL, :err => File::NULL)
+        pid && Process.kill(0, pid)
       end
 
       def log
@@ -91,13 +91,13 @@ class Fluentd
 
       def stop
         return unless running?
-        system("/bin/kill -TERM #{pid}")
+        Process.kill(:TERM, pid)
         File.unlink(pid_file)
       end
 
       def reload
         return unless running?
-        system("/bin/kill -HUP #{pid}")
+        Process.kill(:HUP, pid)
       end
     end
 

From a3c2696fd3b7c03d4d21ec0ff9cc95e60ffad027 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 13:59:08 +0900
Subject: [PATCH 16/22] Rename: reload -> restart

---
 app/controllers/fluentd/agents_controller.rb | 4 ++--
 app/models/fluentd/agent.rb                  | 6 +++---
 app/views/fluentd/agents/show.html.haml      | 2 +-
 config/locales/translation_ja.yml            | 2 +-
 config/routes.rb                             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/fluentd/agents_controller.rb b/app/controllers/fluentd/agents_controller.rb
index bd3adb8..b912b9d 100644
--- a/app/controllers/fluentd/agents_controller.rb
+++ b/app/controllers/fluentd/agents_controller.rb
@@ -14,8 +14,8 @@ class Fluentd::AgentsController < ApplicationController
     redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
-  def reload
-    @fluentd.agent.reload
+  def restart
+    @fluentd.agent.restart
     redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index 25c46b0..338cca7 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -37,7 +37,7 @@ class Fluentd
         extra_options[:config_file] || self.class.default_options[:config_file]
       end
 
-      %w(start stop reload).each do |method|
+      %w(start stop restart).each do |method|
         define_method(method) do
           raise NotImplementedError
         end
@@ -95,7 +95,7 @@ class Fluentd
         File.unlink(pid_file)
       end
 
-      def reload
+      def restart
         return unless running?
         Process.kill(:HUP, pid)
       end
@@ -118,7 +118,7 @@ class Fluentd
         system('/etc/init.d/td-agent stop')
       end
 
-      def reload
+      def restart
         # NOTE: td-agent has no reload command
         # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
         system('/etc/init.d/td-agent restart')
diff --git a/app/views/fluentd/agents/show.html.haml b/app/views/fluentd/agents/show.html.haml
index b2ffc77..11d5f28 100644
--- a/app/views/fluentd/agents/show.html.haml
+++ b/app/views/fluentd/agents/show.html.haml
@@ -5,6 +5,6 @@
 
 = link_to t(".start"), start_fluentd_agent_path(@fluentd), method: :put
 = link_to t(".stop"), stop_fluentd_agent_path(@fluentd), method: :put
-= link_to t(".reload"), reload_fluentd_agent_path(@fluentd), method: :put
+= link_to t(".restart"), restart_fluentd_agent_path(@fluentd), method: :put
 = link_to t(".log"), log_fluentd_agent_path(@fluentd)
 TODO: config
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 3c58cda..1a2e6ff 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -55,7 +55,7 @@ ja:
       <<: *terms
       start: 開始
       stop: 停止
-      reload: リロード
+      restart: 再起動
       log: ログ
       stopped: 停止中
       running: 稼働中
diff --git a/config/routes.rb b/config/routes.rb
index fe346ef..bc2d9ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,7 +5,7 @@ Rails.application.routes.draw do
     resource :agent, only: [:show], module: :fluentd do
       put "start"
       put "stop"
-      put "reload"
+      put "restart"
       get "log"
     end
     resource :setting, only: [:show, :edit, :update], module: :fluentd do

From 479258a84acd12f27b1e9ef9b21239a2db77cb5f Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 14:21:37 +0900
Subject: [PATCH 17/22] Error handling for start/stop/restart

---
 app/controllers/fluentd/agents_controller.rb | 12 ++++++--
 app/models/fluentd/agent.rb                  | 29 ++++++++++++++------
 app/views/fluentd/agents/show.html.haml      |  3 ++
 config/locales/translation_ja.yml            |  3 ++
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/app/controllers/fluentd/agents_controller.rb b/app/controllers/fluentd/agents_controller.rb
index b912b9d..7eb5967 100644
--- a/app/controllers/fluentd/agents_controller.rb
+++ b/app/controllers/fluentd/agents_controller.rb
@@ -5,17 +5,23 @@ class Fluentd::AgentsController < ApplicationController
   end
 
   def start
-    @fluentd.agent.start
+    unless @fluentd.agent.start
+      flash[:error] = t("error.fluentd_start_failed")
+    end
     redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def stop
-    @fluentd.agent.stop
+    unless @fluentd.agent.stop
+      flash[:error] = t("error.fluentd_stop_failed")
+    end
     redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def restart
-    @fluentd.agent.restart
+    unless @fluentd.agent.restart
+      flash[:error] = t("error.fluentd_restart_failed")
+    end
     redirect_to fluentd_agent_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index 338cca7..739c0d0 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -17,6 +17,10 @@ class Fluentd
         File.read(pid_file).to_i rescue nil
       end
 
+      def wait_process_starting_seconds
+        5 # TODO: how long wait?
+      end
+
       def running?
         pid && Process.kill(0, pid)
       end
@@ -79,24 +83,31 @@ class Fluentd
       end
 
       def start
-        return if running?
+        return true if running?
         spawn("bundle exec fluentd #{options_to_argv}")
-        timeout(5) do # TODO: decide how long wait
-          loop do
-            break if pid && Process.kill(0, pid)
-            sleep 0.01
+        begin
+          timeout(wait_process_starting_seconds) do
+            loop do
+              break if pid && Process.kill(0, pid)
+              sleep 0.01
+            end
           end
+          true
+        rescue TimeoutError
+          false
         end
       end
 
       def stop
-        return unless running?
-        Process.kill(:TERM, pid)
-        File.unlink(pid_file)
+        return true unless running?
+        if Process.kill(:TERM, pid)
+          File.unlink(pid_file)
+          true
+        end
       end
 
       def restart
-        return unless running?
+        return false unless running?
         Process.kill(:HUP, pid)
       end
     end
diff --git a/app/views/fluentd/agents/show.html.haml b/app/views/fluentd/agents/show.html.haml
index 11d5f28..806cb1d 100644
--- a/app/views/fluentd/agents/show.html.haml
+++ b/app/views/fluentd/agents/show.html.haml
@@ -1,5 +1,8 @@
 - page_title t('.page_title', label: "##{@fluentd.id}")
 
+- if flash[:error]
+  %div.alert.alert-danger= flash[:error]
+
 %h4
   = @fluentd.agent.running? ? t(".running") : t(".stopped")
 
diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
index 1a2e6ff..ae807e4 100644
--- a/config/locales/translation_ja.yml
+++ b/config/locales/translation_ja.yml
@@ -92,6 +92,9 @@ ja:
 
   error:
     login_failed: ログインに失敗しました。
+    fluentd_start_failed: fluentdの起動に失敗しました。
+    fluentd_stop_failed: fluentdの停止に失敗しました。
+    fluentd_restart_failed: fluentdの再起動に失敗しました。
 
   activerecord:
     errors:

From d17bef2f3275da93a4baa7ae6aef7eca11de3b1e Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 14:26:43 +0900
Subject: [PATCH 18/22] Refactoring: Agent::Base class -> Agent::Common module.
 because Base won't be a instantiate

---
 app/models/fluentd/agent.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index 739c0d0..0b5eb11 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -5,7 +5,7 @@ require 'fluent/supervisor'
 
 class Fluentd
   class Agent
-    class Base
+    module Common
       attr_reader :extra_options
 
       def initialize(options = {})
@@ -64,7 +64,8 @@ class Fluentd
       #   fluentd: /etc/fluent/fluent.conf (by fluentd -s)
     end
 
-    class Fluentd < Base
+    class Fluentd
+      include Common
       def self.default_options
         {
           :pid_file => "/var/run/fluent.pid",
@@ -112,7 +113,8 @@ class Fluentd
       end
     end
 
-    class TdAgent < Base
+    class TdAgent
+      include Common
       def self.default_options
         {
           :pid_file => "/var/run/td-agent/td-agent.pid",
@@ -136,7 +138,8 @@ class Fluentd
       end
     end
 
-    class Remote < Base # TODO
+    class Remote # TODO
+      include Common
     end
   end
 end

From f057f27fc58cdd14b2a9020dc626c8a5ac8c1b9a Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 14:57:59 +0900
Subject: [PATCH 19/22] Refactoring: Separate file for each class

---
 app/models/fluentd/agent.rb          | 155 ++++-----------------------
 app/models/fluentd/agent/common.rb   |  62 +++++++++++
 app/models/fluentd/agent/fluentd.rb  |  52 +++++++++
 app/models/fluentd/agent/remote.rb   |   7 ++
 app/models/fluentd/agent/td_agent.rb |  28 +++++
 5 files changed, 168 insertions(+), 136 deletions(-)
 create mode 100644 app/models/fluentd/agent/common.rb
 create mode 100644 app/models/fluentd/agent/fluentd.rb
 create mode 100644 app/models/fluentd/agent/remote.rb
 create mode 100644 app/models/fluentd/agent/td_agent.rb

diff --git a/app/models/fluentd/agent.rb b/app/models/fluentd/agent.rb
index 0b5eb11..e4ac19d 100644
--- a/app/models/fluentd/agent.rb
+++ b/app/models/fluentd/agent.rb
@@ -2,144 +2,27 @@ require 'fluent/log'
 require 'fluent/env'
 require 'fluent/version'
 require 'fluent/supervisor'
+require "fluentd/agent/common"
+require "fluentd/agent/fluentd"
+require "fluentd/agent/td_agent"
+require "fluentd/agent/remote"
 
 class Fluentd
   class Agent
-    module Common
-      attr_reader :extra_options
-
-      def initialize(options = {})
-        @extra_options = options
-      end
-
-      def pid
-        return unless File.exists?(pid_file)
-        File.read(pid_file).to_i rescue nil
-      end
-
-      def wait_process_starting_seconds
-        5 # TODO: how long wait?
-      end
-
-      def running?
-        pid && Process.kill(0, pid)
-      end
-
-      def log
-        File.read(log_file) # TODO: large log file
-      end
-
-      def pid_file
-        extra_options[:pid_file] || self.class.default_options[:pid_file]
-      end
-
-      def log_file
-        extra_options[:log_file] || self.class.default_options[:log_file]
-      end
-
-      def config_file
-        extra_options[:config_file] || self.class.default_options[:config_file]
-      end
-
-      %w(start stop restart).each do |method|
-        define_method(method) do
-          raise NotImplementedError
-        end
-      end
-
-      # pidfile
-      #   td-agent: /var/run/td-agent/td-agent.pid
-      #   - https://github.com/treasure-data/td-agent/blob/master/td-agent.logrotate#L10
-      #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L25
-      #   fluentd:  nothing (or --daemon PIDFILE)
-      #
-      # logfile
-      #   td-agent: /var/log/td-agent/td-agent.log
-      #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L28
-      #   fluentd: stdout (or --log LOGFILE)
-      #
-      # config file
-      #   td-agent: /etc/td-agent/td-agent.conf
-      #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.postinst#L69
-      #   fluentd: /etc/fluent/fluent.conf (by fluentd -s)
-    end
-
-    class Fluentd
-      include Common
-      def self.default_options
-        {
-          :pid_file => "/var/run/fluent.pid",
-          :log_file => "/var/log/fluent.log",
-          :config_file => "/etc/fluent/fluent.conf",
-        }
-      end
-
-      def options_to_argv
-        argv = ""
-        argv << " --use-v1-config"
-        argv << " -c #{config_file}"
-        argv << " -d #{pid_file}"
-        argv << " -o #{log_file}"
-        argv
-      end
-
-      def start
-        return true if running?
-        spawn("bundle exec fluentd #{options_to_argv}")
-        begin
-          timeout(wait_process_starting_seconds) do
-            loop do
-              break if pid && Process.kill(0, pid)
-              sleep 0.01
-            end
-          end
-          true
-        rescue TimeoutError
-          false
-        end
-      end
-
-      def stop
-        return true unless running?
-        if Process.kill(:TERM, pid)
-          File.unlink(pid_file)
-          true
-        end
-      end
-
-      def restart
-        return false unless running?
-        Process.kill(:HUP, pid)
-      end
-    end
-
-    class TdAgent
-      include Common
-      def self.default_options
-        {
-          :pid_file => "/var/run/td-agent/td-agent.pid",
-          :log_file => "/var/log/td-agent/td-agent.log",
-          :config_file => "/etc/td-agent/td-agent.conf",
-        }
-      end
-
-      def start
-        system('/etc/init.d/td-agent start')
-      end
-
-      def stop
-        system('/etc/init.d/td-agent stop')
-      end
-
-      def restart
-        # NOTE: td-agent has no reload command
-        # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
-        system('/etc/init.d/td-agent restart')
-      end
-    end
-
-    class Remote # TODO
-      include Common
-    end
+    # pidfile
+    #   td-agent: /var/run/td-agent/td-agent.pid
+    #   - https://github.com/treasure-data/td-agent/blob/master/td-agent.logrotate#L10
+    #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L25
+    #   fluentd:  nothing (or --daemon PIDFILE)
+    #
+    # logfile
+    #   td-agent: /var/log/td-agent/td-agent.log
+    #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L28
+    #   fluentd: stdout (or --log LOGFILE)
+    #
+    # config file
+    #   td-agent: /etc/td-agent/td-agent.conf
+    #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.postinst#L69
+    #   fluentd: /etc/fluent/fluent.conf (by fluentd -s)
   end
 end
diff --git a/app/models/fluentd/agent/common.rb b/app/models/fluentd/agent/common.rb
new file mode 100644
index 0000000..4a40011
--- /dev/null
+++ b/app/models/fluentd/agent/common.rb
@@ -0,0 +1,62 @@
+# pidfile
+#   td-agent: /var/run/td-agent/td-agent.pid
+#   - https://github.com/treasure-data/td-agent/blob/master/td-agent.logrotate#L10
+#   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L25
+#   fluentd:  nothing (or --daemon PIDFILE)
+#
+# logfile
+#   td-agent: /var/log/td-agent/td-agent.log
+#   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L28
+#   fluentd: stdout (or --log LOGFILE)
+#
+# config file
+#   td-agent: /etc/td-agent/td-agent.conf
+#   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.postinst#L69
+#   fluentd: /etc/fluent/fluent.conf (by fluentd -s)
+
+class Fluentd
+  class Agent
+    module Common
+      attr_reader :extra_options
+
+      def initialize(options = {})
+        @extra_options = options
+      end
+
+      def pid
+        return unless File.exists?(pid_file)
+        File.read(pid_file).to_i rescue nil
+      end
+
+      def wait_process_starting_seconds
+        5 # TODO: how long wait?
+      end
+
+      def running?
+        pid && Process.kill(0, pid)
+      end
+
+      def log
+        File.read(log_file) # TODO: large log file
+      end
+
+      def pid_file
+        extra_options[:pid_file] || self.class.default_options[:pid_file]
+      end
+
+      def log_file
+        extra_options[:log_file] || self.class.default_options[:log_file]
+      end
+
+      def config_file
+        extra_options[:config_file] || self.class.default_options[:config_file]
+      end
+
+      %w(start stop restart).each do |method|
+        define_method(method) do
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/fluentd/agent/fluentd.rb b/app/models/fluentd/agent/fluentd.rb
new file mode 100644
index 0000000..660df49
--- /dev/null
+++ b/app/models/fluentd/agent/fluentd.rb
@@ -0,0 +1,52 @@
+class Fluentd
+  class Agent
+    class Fluentd
+      include Common
+      def self.default_options
+        {
+          :pid_file => "/var/run/fluent.pid",
+          :log_file => "/var/log/fluent.log",
+          :config_file => "/etc/fluent/fluent.conf",
+        }
+      end
+
+      def options_to_argv
+        argv = ""
+        argv << " --use-v1-config"
+        argv << " -c #{config_file}"
+        argv << " -d #{pid_file}"
+        argv << " -o #{log_file}"
+        argv
+      end
+
+      def start
+        return true if running?
+        spawn("bundle exec fluentd #{options_to_argv}")
+        begin
+          timeout(wait_process_starting_seconds) do
+            loop do
+              break if pid && Process.kill(0, pid)
+              sleep 0.01
+            end
+          end
+          true
+        rescue TimeoutError
+          false
+        end
+      end
+
+      def stop
+        return true unless running?
+        if Process.kill(:TERM, pid)
+          File.unlink(pid_file)
+          true
+        end
+      end
+
+      def restart
+        return false unless running?
+        Process.kill(:HUP, pid)
+      end
+    end
+  end
+end
diff --git a/app/models/fluentd/agent/remote.rb b/app/models/fluentd/agent/remote.rb
new file mode 100644
index 0000000..e5de011
--- /dev/null
+++ b/app/models/fluentd/agent/remote.rb
@@ -0,0 +1,7 @@
+class Fluentd
+  class Agent
+    class Remote # TODO
+      include Common
+    end
+  end
+end
diff --git a/app/models/fluentd/agent/td_agent.rb b/app/models/fluentd/agent/td_agent.rb
new file mode 100644
index 0000000..870e713
--- /dev/null
+++ b/app/models/fluentd/agent/td_agent.rb
@@ -0,0 +1,28 @@
+class Fluentd
+  class Agent
+    class TdAgent
+      include Common
+      def self.default_options
+        {
+          :pid_file => "/var/run/td-agent/td-agent.pid",
+          :log_file => "/var/log/td-agent/td-agent.log",
+          :config_file => "/etc/td-agent/td-agent.conf",
+        }
+      end
+
+      def start
+        system('/etc/init.d/td-agent start')
+      end
+
+      def stop
+        system('/etc/init.d/td-agent stop')
+      end
+
+      def restart
+        # NOTE: td-agent has no reload command
+        # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
+        system('/etc/init.d/td-agent restart')
+      end
+    end
+  end
+end

From 7eefa05a4430c33ed035cc8534a840ac4fbedf0e Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 15:16:49 +0900
Subject: [PATCH 20/22] Add specs

---
 app/models/fluentd/agent/fluentd.rb  | 45 ++++++++++++++++-------
 app/models/fluentd/agent/td_agent.rb |  1 +
 spec/models/fluentd/agent_spec.rb    | 54 ++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/app/models/fluentd/agent/fluentd.rb b/app/models/fluentd/agent/fluentd.rb
index 660df49..7d0d9bf 100644
--- a/app/models/fluentd/agent/fluentd.rb
+++ b/app/models/fluentd/agent/fluentd.rb
@@ -2,6 +2,7 @@ class Fluentd
   class Agent
     class Fluentd
       include Common
+
       def self.default_options
         {
           :pid_file => "/var/run/fluent.pid",
@@ -21,7 +22,38 @@ class Fluentd
 
       def start
         return true if running?
+        actual_start
+      end
+
+      def stop
+        return true unless running?
+        actual_stop
+      end
+
+      def restart
+        return false unless running?
+        actual_restart
+      end
+
+      private
+
+      def actual_start
         spawn("bundle exec fluentd #{options_to_argv}")
+        wait_starting
+      end
+
+      def actual_stop
+        if Process.kill(:TERM, pid)
+          File.unlink(pid_file)
+          true
+        end
+      end
+
+      def actual_restart
+        Process.kill(:HUP, pid)
+      end
+
+      def wait_starting
         begin
           timeout(wait_process_starting_seconds) do
             loop do
@@ -34,19 +66,6 @@ class Fluentd
           false
         end
       end
-
-      def stop
-        return true unless running?
-        if Process.kill(:TERM, pid)
-          File.unlink(pid_file)
-          true
-        end
-      end
-
-      def restart
-        return false unless running?
-        Process.kill(:HUP, pid)
-      end
     end
   end
 end
diff --git a/app/models/fluentd/agent/td_agent.rb b/app/models/fluentd/agent/td_agent.rb
index 870e713..7f2bbbf 100644
--- a/app/models/fluentd/agent/td_agent.rb
+++ b/app/models/fluentd/agent/td_agent.rb
@@ -2,6 +2,7 @@ class Fluentd
   class Agent
     class TdAgent
       include Common
+
       def self.default_options
         {
           :pid_file => "/var/run/td-agent/td-agent.pid",
diff --git a/spec/models/fluentd/agent_spec.rb b/spec/models/fluentd/agent_spec.rb
index 6ca743a..3498405 100644
--- a/spec/models/fluentd/agent_spec.rb
+++ b/spec/models/fluentd/agent_spec.rb
@@ -44,6 +44,60 @@ describe Fluentd::Agent do
       it { should include("-o #{instance.log_file}") }
       it { should include("--use-v1-config") }
     end
+
+    describe "#start" do
+      before { instance.stub(:running?).and_return { running } }
+
+      context "running" do
+        let(:running) { true }
+        after { instance.start }
+
+        it { instance.should_not_receive(:actual_start) }
+      end
+
+      context "not running" do
+        let(:running) { false }
+        after { instance.start }
+
+        it { instance.should_receive(:actual_start) }
+      end
+    end
+
+    describe "#stop" do
+      before { instance.stub(:running?).and_return { running } }
+
+      context "running" do
+        let(:running) { true }
+        after { instance.stop }
+
+        it { instance.should_receive(:actual_stop) }
+      end
+
+      context "not running" do
+        let(:running) { false }
+        after { instance.stop }
+
+        it { instance.should_not_receive(:actual_stop) }
+      end
+    end
+
+    describe "#restart" do
+      before { instance.stub(:running?).and_return { running } }
+
+      context "running" do
+        let(:running) { true }
+        after { instance.restart }
+
+        it { instance.should_receive(:actual_restart) }
+      end
+
+      context "not running" do
+        let(:running) { false }
+        after { instance.restart }
+
+        it { instance.should_not_receive(:actual_restart) }
+      end
+    end
   end
 
   describe "TdAgent" do

From 296477a714ddbd51bee44c5f96faf6dd79f67967 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 17:09:51 +0900
Subject: [PATCH 21/22] --dry-run for a check before fluentd start

---
 app/models/fluentd/agent/common.rb  | 2 +-
 app/models/fluentd/agent/fluentd.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/fluentd/agent/common.rb b/app/models/fluentd/agent/common.rb
index 4a40011..59796ba 100644
--- a/app/models/fluentd/agent/common.rb
+++ b/app/models/fluentd/agent/common.rb
@@ -29,7 +29,7 @@ class Fluentd
       end
 
       def wait_process_starting_seconds
-        5 # TODO: how long wait?
+        10.seconds # wait time for fluentd pidfile created
       end
 
       def running?
diff --git a/app/models/fluentd/agent/fluentd.rb b/app/models/fluentd/agent/fluentd.rb
index 7d0d9bf..8308f11 100644
--- a/app/models/fluentd/agent/fluentd.rb
+++ b/app/models/fluentd/agent/fluentd.rb
@@ -22,7 +22,9 @@ class Fluentd
 
       def start
         return true if running?
-        actual_start
+        if validate_fluentd_options
+          actual_start
+        end
       end
 
       def stop
@@ -37,6 +39,10 @@ class Fluentd
 
       private
 
+      def validate_fluentd_options
+        system("bundle exec fluentd --dry-run #{options_to_argv}")
+      end
+
       def actual_start
         spawn("bundle exec fluentd #{options_to_argv}")
         wait_starting

From bd8c3dd299c0780b4a988d0cad67292bc69564a2 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Fri, 23 May 2014 17:30:02 +0900
Subject: [PATCH 22/22] Fix spec

---
 spec/models/fluentd/agent_spec.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/spec/models/fluentd/agent_spec.rb b/spec/models/fluentd/agent_spec.rb
index 3498405..66a6cef 100644
--- a/spec/models/fluentd/agent_spec.rb
+++ b/spec/models/fluentd/agent_spec.rb
@@ -52,14 +52,24 @@ describe Fluentd::Agent do
         let(:running) { true }
         after { instance.start }
 
-        it { instance.should_not_receive(:actual_start) }
+        it { instance.should_not_receive(:validate_fluentd_options) }
       end
 
       context "not running" do
         let(:running) { false }
         after { instance.start }
 
-        it { instance.should_receive(:actual_start) }
+        it { instance.should_receive(:validate_fluentd_options) }
+
+        context "validate_fluentd_options success" do
+          before { instance.stub(:validate_fluentd_options).and_return { true } }
+          it { instance.should_receive(:actual_start) }
+        end
+
+        context "validate_fluentd_options fail" do
+          before { instance.stub(:validate_fluentd_options).and_return { false } }
+          it { instance.should_not_receive(:actual_start) }
+        end
       end
     end