serf-td-agent 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06034a5521174e358ee6c051be92bf27f013ab39
-  data.tar.gz: 0cf3acd76461f7941f4f95a7c2cb513c42c9b7e0
+  metadata.gz: 952b4e4179ed81673e740da2829c697bfe8a65d6
+  data.tar.gz: c71b2162b68341a7017a61a8f9c00b03cfb4d1df
 SHA512:
-  metadata.gz: 9e88b9a490c8161935e59c26d216bbb00dd8efc9320c20226d2661fdbd10d3a9ed902bbdea98da65e4a0116e2aa045cdd16b14b81e55b8676c8b4905538b9597
-  data.tar.gz: 5c3acdd9d6513b4f6b816647b86ff3237f91639b9dfb061964265c329a468219f7c92ba05130c18eaf098aa73a68bd0b0236d6ef6b46184ee253d49f119a79d5
+  metadata.gz: 14af2d9b29e1d6799658e9db80db8ce11c43c998eee60f63980e38af8302ff979930a5eae5e2d24bde999569931df00c7971b825e94a7db61aba91c26109f4f6
+  data.tar.gz: e32d5979b39a7f62e9c76f169c320844acd46c3639afe30cd71ec70d306cca061298fb973ccd0ed3626693fa5ace0b32b6d61698b7eb00dac45dad03c3015ac2

data/CHANGELOG.md

@@ -1,3 +1,3 @@
-## 0.0.1 (2014/05/19)
+## 0.1.0 (2014/05/22)
 
 First version

data/README.md

@@ -4,43 +4,46 @@ td-agent process management with [serf](http://www.serfdom.io/)
 
 ## Installation
 
-Use RubyGems:
+Assume you have installed [td-agent](http://docs.fluentd.org/categories/installation).
+
+Use [fluent-gem](http://docs.fluentd.org/articles/faq#i-installed-td-agent-and-want-to-add-custom-plugins-how-do-i-do-it):
 
 ```
-gem install serf-td-agent
+fluent-gem install serf-td-agent
 ```
 
-The `serf` command is automatically downloaded and bundled into the `bin` directory. Set the environment variable `PATH` as:
+The `serf` command is automatically downloaded and bundled into the `bin` directory of the gem.
+Also, `serf-td-agent` command, which is a serf event handler, is located at there. Set the environment variable `PATH` as:
 
 ```
-export PATH=$(gem path serf-td-agent)/bin:$PATH
+export PATH=$(fluent-gem path serf-td-agent)/bin:$PATH
 ```
 
 ## How to setup the serf cluster
 
-Run the first serf at any of hosts to run td-agent like:
+Run the first serf at any of hosts running td-agent like:
 
 ```bash
 $ serf agent -event-handler=serf-td-agent
 ```
 
-Run later serfs at other hosts to run td-agent like:
+Run later serfs at other hosts running td-agent like:
 
 ```bash
-$ serf agent -join=${the first serf address} -event-handler=serf-td-agent
+$ serf agent -join={the first serf address} -event-handler=serf-td-agent
 ```
 
-Hint: `-log-level=debug` option should be helpful for debugging. 
+Hint: `-log-level=debug` option would be helpful for debugging. 
 
-## How to start td-agent via serf
+## How to restart td-agent via serf
 
 Send a serf event from any of hosts running the serf like:
 
 ```bash
-$ serf event td-agent-start
+$ serf event td-agent-restart
 ```
 
-This will propagate the `start` event to the entire serf cluster and execute `sudo /etc/init.d/td-agent start` at all hosts.
+This will propagate the `td-agent-restart` event to the entire serf cluster and execute `sudo /etc/init.d/td-agent restart` at all hosts.
 
 ## Available events
 
@@ -56,10 +59,6 @@ Following events are available:
 
 which corresponds with /etc/init.d/td-agent command. 
 
-## ToDo
-
-Use `serf query` for commands which requires responses like `status` and `configtest`. 
-
 ## ChangeLog
 
 See [CHANGELOG.md](CHANGELOG.md) for details.

data/bin/serf-td-agent

@@ -2,13 +2,14 @@
 
 INIT_SCRIPT = "/etc/init.d/td-agent"
 event = ENV['SERF_EVENT']
-user_event = ENV['SERF_USER_EVENT']
+user_event = ENV['SERF_USER_EVENT'] || ENV['SERF_QUERY_NAME']
 td_agent_event = user_event[9..-1] if user_event and user_event.start_with?('td-agent-')
 
 if ARGV[0] == "-h"
-  puts "Usage: SERF_EVENT=user SERF_USER_EVENT={event} #{$PROGRAM_NAME}"
+  puts "Usage: SERF_EVENT=user  SERF_USER_EVENT={event} #{File.basename($PROGRAM_NAME)}"
+  puts "Usage: SERF_EVENT=query SERF_QUERY_NAME={query} #{File.basename($PROGRAM_NAME)}"
   puts ""
-  puts "AVAILABLE EVENTS:"
+  puts "AVAILABLE EVENTS|QUERIES:"
   puts "  td-agent-start"
   puts "  td-agent-stop"
   puts "  td-agent-reload"
@@ -19,15 +20,13 @@ if ARGV[0] == "-h"
   puts ""
   puts "WITH SERF:"
   puts "  serf event {event}"
+  puts "  serf query {query}"
   exit 0
 end
 
 status = 0
-case event
-when "user"
-  case td_agent_event
-  when "start", "stop", "reload", "restart", "condrestart", "status", "configtest"
-    status = system "sudo #{INIT_SCRIPT} #{td_agent_event}"
-  end
+case td_agent_event
+when "start", "stop", "reload", "restart", "condrestart", "status", "configtest"
+  status = system "sudo #{INIT_SCRIPT} #{td_agent_event}"
 end
 exit status

data/serf-td-agent.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "serf-td-agent"
-  s.version     = "0.0.1"
+  s.version     = "0.1.0"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "http://github.com/sonots/serf-td-agent"
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  # s.require_paths = ["lib"]
 
   s.add_runtime_dependency "gem-path", '~> 0'
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serf-td-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-path
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: A td-agent process management with serf