fluentd-server 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29880280e87c05f7108661ac476c81546ad0f5b6
-  data.tar.gz: 9d375e9b51d467ffadebf388991dab55a267d943
+  metadata.gz: 0bdb2c370dae1201863b40f1c52925dd7b7faf9c
+  data.tar.gz: 123bb993f7412ed3401680b766e675ee1ffa5874
 SHA512:
-  metadata.gz: 94c767cc074eaf54d61b60b21bd472ab20545bb39e35c41bbbc9742f5c148d9a8a2bfc0a1e68be936a28a6dddddf9d653087c71ceeef31c83262b67c4c7319bf
-  data.tar.gz: b7c46262f055be84c81a4205ec496022188bbc4923b1bd49a1d5919c65d30fb3b931a7194464c3668e35fbca60db03eddeeb15315d62a2d88dcf0a63c142f10b
+  metadata.gz: 9ce9d5de9c3f5237a703c5987a0eb49762233fa6140ae8fa074486206840c404b2f22bb42a6182501e3eae889e05d2ca22d48303d9286b776b84d689857f63e4
+  data.tar.gz: 4a173696a16bf08097d2771761d511f123d4918b6d07986b48c9bb3a0b05c6b731aa8181cd62f1f72c38a6d43ad2ea2ad72efabb03727854fe5eb42177c72aee

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 0.3.1
+
+Enhancements:
+
+* Add `fluentd-server sync` command
+* Add `fluentd-server td-agent-start` command
+* Add `fluentd-server td-agent-stop` command
+* Add `fluentd-server td-agent-reload` command
+* Add `fluentd-server td-agent-restart` command
+* Add `fluentd-server td-agent-condrestart` command
+* Add `fluentd-server td-agent-status` command
+* Add `fluentd-server td-agent-configtest` command
+
+Changes:
+
+* Rename `fluentd-server sync` command to `fluentd-server sync-worker`
+* Rename `fluentd-server job` command to `fluentd-server job-worker`
+* Rename `fluentd-server job_clear` command to `fluentd-server job-clean`
+
 # 0.3.0
 
 Enhancements:

data/Procfile

@@ -1,4 +1,4 @@
 web: bundle exec unicorn -E production -p $PORT -o $HOST -c config/unicorn.conf
-job: bundle exec bin/fluentd-server job
-sync: bundle exec bin/fluentd-server sync
+job: bundle exec bin/fluentd-server job-worker
+sync: bundle exec bin/fluentd-server sync-worker
 serf: $(bundle exec gem path serf-td-agent)/bin/serf agent

data/README.md

@@ -100,16 +100,18 @@ HOST=0.0.0.0
 # LOG_LEVEL=debug
 # LOG_SHIFT_AGE=0
 # LOG_SHIFT_SIZE=1048576
-# LOCAL_STORAGE=false
-# DATA_DIR=data
-# SYNC_INTERVAL=60
 ```
 
-### LOCAL FILE STORAGE
+## HTTP API
+
+See [API.md](API.md).
 
-Fluentd Server also supports to edit Fluentd configuration files as local files for the case using `git` (or any VCSs) to manage Fluentd configuration revisions. 
+### Use Fluentd Server from Command Line
 
-To use this feature, enable `LOCAL_STORAGE` in `.env` file:
+For the case you want to edit Fluentd configuration files from your favorite editors rather than from the Web UI, `LOCAL STORAGE` feature is available.
+With this feature, you should also be able to manage your configuration files with git (or any VCS).
+
+To use this feature, enable `LOCAL_STORAGE` in `.env` file as:
 
 ```
 LOCAL_STORAGE=true
@@ -117,15 +119,41 @@ DATA_DIR=data
 SYNC_INTERVAL=60
 ```
 
-The `DATA_DIR` is the location to place your configuration files locally, and the `SYNC_INTERVAL` is the interval where a synchronization worker works.
+where the `DATA_DIR` is the location to place your configuration files locally, and the `SYNC_INTERVAL` is the interval where a synchronization worker works.
+
+Putting any files whose name ends with `.erb` in `DATA_DIR` is automatically synchronized with DB by the synchronization worker. Removing `.erb` files is also synchronized with DB.
+For the case you want to synchronize immediately, `sync` command is also available.
+
+```
+$ fluentd-server sync
+```
 
-Putting any files whose name ends with `.erb` in `DATA_DIR` automatically synchronizes with DB by the `sync` worker. Removing `.erb` files is also synchronized with DB. 
+NOTE: Enabling this feature disables to edit the Fluentd configuration from the Web UI.
 
-NOTE: Enabling this feature disables to edit the Fluentd configuration from the Web UI. 
+### CLI (Command Line Interface)
 
-## HTTP API
+Here is a full list of fluentd-server commands.
 
-See [API.md](API.md).
+```bash
+$ fluentd-server help
+Commands:
+  fluentd-server help [COMMAND]        # Describe available commands or one specific command
+  fluentd-server init                  # Creates database schema
+  fluentd-server job-clean             # Clean fluentd_server delayed_job queue
+  fluentd-server job-worker            # Sartup fluentd_server job worker
+  fluentd-server migrate               # Migrate database schema
+  fluentd-server new                   # Creates fluentd-server resource directory
+  fluentd-server start                 # Sartup fluentd_server
+  fluentd-server sync                  # Synchronize local file storage with db immediately
+  fluentd-server sync-worker           # Sartup fluentd_server sync worker
+  fluentd-server td-agent-condrestart  # Run `/etc/init.d/td-agent condrestart` via serf event
+  fluentd-server td-agent-configtest   # Run `/etc/init.d/td-agent configtest` via serf query
+  fluentd-server td-agent-reload       # Run `/etc/init.d/td-agent reload` via serf event
+  fluentd-server td-agent-restart      # Run `/etc/init.d/td-agent restart` via serf event
+  fluentd-server td-agent-start        # Run `/etc/init.d/td-agent start` via serf event
+  fluentd-server td-agent-status       # Run `/etc/init.d/td-agent status` via serf query
+  fluentd-server td-agent-stop         # Run `/etc/init.d/td-agent stop` via serf event
+```
 
 ## ToDo
 

data/lib/fluentd_server/cli.rb

@@ -30,8 +30,8 @@ EOS
 
   DEFAULT_PROCFILE =<<-EOS
 web: unicorn -E production -p $PORT -o $HOST -c config/unicorn.conf
-job: fluentd-server job
-sync: fluentd-server sync
+job: fluentd-server job-worker
+sync: fluentd-server sync-worker
 serf: $(gem path serf-td-agent)/bin/serf agent
 EOS
 
@@ -87,8 +87,8 @@ EOS
   end
 
   # reference: https://gist.github.com/robhurring/732327
-  desc "job", "Sartup fluentd_server job worker"
-  def job
+  desc "job-worker", "Sartup fluentd_server job worker"
+  def job_worker
     Dotenv.load
     require 'delayed_job'
     require 'fluentd_server/model'
@@ -101,21 +101,80 @@ EOS
     Delayed::Worker.new(worker_options).start
   end
 
-  desc "job_clear", "Clear fluentd_server delayed_job queue"
-  def job_clear
+  desc "job-clean", "Clean fluentd_server delayed_job queue"
+  def job_clean
     Dotenv.load
     require 'delayed_job'
     require 'fluentd_server/model'
     Delayed::Job.delete_all
   end
 
-  desc "sync", "Sartup fluentd_server sync worker"
-  def sync
+  desc "sync-worker", "Sartup fluentd_server sync worker"
+  def sync_worker
     Dotenv.load
     require 'fluentd_server/sync_worker'
     FluentdServer::SyncWorker.start
   end
 
+  desc "sync", "Synchronize local file storage with db immediately"
+  def sync
+    Dotenv.load
+    require 'fluentd_server/sync_runner'
+    FluentdServer::SyncRunner.run
+  end
+
+  desc "td-agent-start", "Run `/etc/init.d/td-agent start` via serf event"
+  def td_agent_start
+    Dotenv.load
+    require 'fluentd_server/model'
+    system("#{::Task.serf_path} event td-agent-start")
+  end
+
+  desc "td-agent-stop", "Run `/etc/init.d/td-agent stop` via serf event"
+  def td_agent_stop
+    Dotenv.load
+    require 'fluentd_server/model'
+    system("#{::Task.serf_path} event td-agent-stop")
+  end
+
+  desc "td-agent-reload", "Run `/etc/init.d/td-agent reload` via serf event"
+  def td_agent_reload
+    Dotenv.load
+    require 'fluentd_server/model'
+    system("#{::Task.serf_path} event td-agent-reload")
+  end
+
+  desc "td-agent-restart", "Run `/etc/init.d/td-agent restart` via serf event"
+  def td_agent_restart
+    Dotenv.load
+    require 'fluentd_server/model'
+    # ::Task.create_and_delete(name: 'Restart').restart # using delayed_job
+    system("#{::Task.serf_path} event td-agent-restart")
+  end
+
+  desc "td-agent-condrestart", "Run `/etc/init.d/td-agent condrestart` via serf event"
+  def td_agent_condrestart
+    Dotenv.load
+    require 'fluentd_server/model'
+    system("#{::Task.serf_path} event td-agent-condrestart")
+  end
+
+  desc "td-agent-status", "Run `/etc/init.d/td-agent status` via serf query"
+  def td_agent_status
+    Dotenv.load
+    require 'fluentd_server/model'
+    # ::Task.create_and_delete(name: 'Status').status # using delayed_job
+    system("#{::Task.serf_path} query td-agent-status")
+  end
+
+  desc "td-agent-configtest", "Run `/etc/init.d/td-agent configtest` via serf query"
+  def td_agent_configtest
+    Dotenv.load
+    require 'fluentd_server/model'
+    # ::Task.create_and_delete(name: 'Configtest').configtest # using delayed_job
+    system("#{::Task.serf_path} query td-agent-configtest")
+  end
+
   no_tasks do
     def abort(msg)
       $stderr.puts msg

data/lib/fluentd_server/sync_runner.rb

@@ -12,6 +12,7 @@ class FluentdServer::SyncRunner
   end
 
   def run
+    logger.debug "[sync] sync runner started"
     return nil unless FluentdServer::Config.local_storage
     plus, minus = find_diff
     create(plus)

data/lib/fluentd_server/version.rb

@@ -1,3 +1,3 @@
 module FluentdServer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Naotoshi Seo