luban-kibana 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc7e78ce9b0e17531c87d41b02c3424e931822e
-  data.tar.gz: 4c079e9cf67d08b9540d39bb5790fab23bec510f
+  metadata.gz: 76f71722971cdc1936980873599332a3373fc64b
+  data.tar.gz: de5a9f357a8ae6e676c205093f279eb46c7704f5
 SHA512:
-  metadata.gz: 7546a2e85c98763eed2fb7e6b72113e65d32bf6da969139f0991615d3f09d1c754e342bb90e44771e4937c74c639dbdcf4b14965878601777d69f4c78e1bac8d
-  data.tar.gz: f0e07bc437f5c71776d9fc82021fada033e2098347cb9ef0abc90d60d3e9b3eb397645903af6e4d524af40db2babbc8af98b65d2f58a359e3ab2c1437e8e6d15
+  metadata.gz: 8f4d9b2c0f330d462e79b1aacbd747b7a08b2b5bbd1f1367364789e4d13fb26bfecb9f9ab7a709487860711d0896ad2edceccc20fd950d00187e0d7b9f0396c6
+  data.tar.gz: 3532f992180c7a100a354c99594df8fe1b33e13eb778931c638fce0173d7c6d9e1eaea393a7c78dc40f924d14190546cdd8e80d0f3a2007c91bce9cef1af07f9

data/CHANGLOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.1.2 (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.1 (Sept 02, 2016)
 
 Minor enhancements:

data/lib/luban/deployment/packages/kibana/controller.rb

@@ -8,20 +8,17 @@ module Luban
               base.define_executable 'kibana'
             end
 
-            def shell_command_output
-              @shell_command_output ||= ''
-            end
-
             def process_pattern
               @process_pattern ||= "#{control_file_path}$"
             end
 
             def start_command
-              @start_command ||= "#{kibana_executable} -c #{control_file_path} >/dev/null 2>&1 &"
+              #@start_command ||= shell_command("#{kibana_executable} -c #{control_file_path}")
+              @start_command ||= shell_command("#{kibana_executable} -c #{control_file_path}", output: nil) + ' &'
             end
 
             def stop_command
-              @stop_command ||= "kill $(cat #{pid_file_path} 2>/dev/null) 2>&1"
+              @stop_command ||= shell_command("kill $(cat #{pid_file_path} 2>/dev/null)")
             end
           end
 

data/lib/luban/deployment/packages/kibana/templates/kibana.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) %>'"
-  stop program = "/bin/bash -c '<%= compose_command(stop_command) %>'"
+  start program = "/bin/bash -c 'sleep 1; <%= start_command %>'"
+  stop program = "/bin/bash -c '<%= stop_command %>'"
   if failed port <%= port %> for 4 times within 8 cycles then restart
   if cpu is greater than 80% for 20 cycles then alert
   if loadavg(5min) greater than 10 for 40 cycles then restart

data/lib/luban/deployment/packages/kibana/version.rb

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Packages
       class Kibana
-        VERSION = '0.1.1'
+        VERSION = '0.1.2'
       end
     end
   end

data/luban-kibana.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.12"
+  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-kibana
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 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.12
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.12
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement