luban-fluentd 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee306b1a06dd344ff414ddc8de9683fc3c2f6e65
-  data.tar.gz: d6cf88d60a8df08b95aa362f745ac3ba7ea8100a
+  metadata.gz: 276270dbd85057b1ccb400d6530531dcfa77dc28
+  data.tar.gz: b26f31768828c66f702bdd4b2d214f13bbce278a
 SHA512:
-  metadata.gz: 81396ad6d99b531bb07c72b2fb85a90cfca2e3d9bda50c90e491f8cddac8c7cc63b95e4dc148d3123e533953209c50e5ae977229500facf2579635ac6847a20b
-  data.tar.gz: f3646411b8631884ccb57d6b24edbacb2f4639c37b7c90b238a958a2c28692aa1c22488559055ebc27007407ca4ba230961cfb970c4cd18c8ff9202e9a9085f6
+  metadata.gz: 7a8c57a59703beef53ee73764cb5bf32433ad48f388ae206f7803e8bc66230f78f8bdf8addfe0ebd6834b69fe028e3915d58861317295a7ca4bceca5a39e2914
+  data.tar.gz: 914ca49bf505de15a6dcbdbced31e72bb0f5dd8ed1e626cac336e202a3d6777918c065d84a4707000c2b1b553c2fb8880ac9e8ad87258f05ae6b5ef435716dc2

data/CHANGLOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.1.4 (Sept 20, 2016)
+
+Minor enhancements:
+  * Refactored the way of composing shell commands
+    * As a result, bumped up the gem dependency on Luban to version 0.8.0
+
 ## Version 0.1.3 (Sept 04, 2016)
 
 Minor enhancements:

data/lib/luban/deployment/applications/fluentd/controller.rb

@@ -4,24 +4,16 @@ module Luban
       class Fluentd
         class Controller < Luban::Deployment::Application::Controller
           module Commands
-            def ruby_bin_path
-              @ruby_bin_path ||= package_bin_path('ruby')
-            end
-
-            def bundle_executable
-              @bundle_executable ||= ruby_bin_path.join('bundle')
-            end
-
             def process_pattern
               @process_pattern ||= "^supervisor:#{env_name}"
             end
 
             def start_command
-              @start_command ||= "#{bundle_executable} exec fluentd -c #{control_file_path} -d #{pid_file_path} -o #{log_file_path}"
+              @start_command ||= bundle_command("fluentd -c #{control_file_path} -d #{pid_file_path} -o #{log_file_path}")
             end
 
             def stop_command
-              @stop_command ||= "kill $(cat #{pid_file_path} 2>/dev/null)"
+              @stop_command ||= shell_command("kill $(cat #{pid_file_path} 2>/dev/null)")
             end
           end
 

data/lib/luban/deployment/applications/fluentd/templates/fluentd.monitrc.erb

@@ -3,8 +3,8 @@
 check process <%= service_entry %>
   with pidfile <%= pid_file_path %>
   onreboot laststate
-  start program = "/bin/bash -c 'sleep 1; <%= compose_command(start_command) %>; sleep 5'"
-  stop program = "/bin/bash -c '<%= compose_command(stop_command) %>'"
+  start program = "/bin/bash -c 'sleep 1; <%= start_command %>; sleep 5'"
+  stop program = "/bin/bash -c '<%= stop_command %>'"
   if totalmem is greater than 50.0 MB for 40 cycles then restart
   if failed port <%= port %> for 4 times within 8 cycles then restart
   if cpu is greater than 80% for 20 cycles then alert

data/lib/luban/deployment/applications/fluentd/version.rb

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Applications
       class Fluentd
-        VERSION = '0.1.3'
+        VERSION = '0.1.4'
       end
     end
   end

data/luban-fluentd.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
-  spec.add_dependency 'luban', ">= 0.7.13"
+  spec.add_dependency 'luban', ">= 0.8.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-fluentd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.13
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.13
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement