foreman_debian 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ff7b62053b9605997acba74dc6005957fcf7cd
-  data.tar.gz: a90106da6bbb7bb20c7f1cbbb0ff956681fcc995
+  metadata.gz: d36c851de35ae04015e73084baa78e2db1fe9656
+  data.tar.gz: e49cab29d9fc6700bf3c331a941a03bd99b3fd69
 SHA512:
-  metadata.gz: 6311435424bb6c9ee691797db6791ecf46dd9e1569490a3987a5c85e2f50e355b7348c2cdd6b9cf29175bb0642b00d100d119f783bf5795cfb1e4fcb4a2c2301
-  data.tar.gz: 2fbf8b7c5f779f19c9c6ce97d736837c7e0c8699354b9f6957a778c58e4a98375e72e0dcb650f4eede43c7c87f1510d1dd672cad64696fa09a4cdfef297499d3
+  metadata.gz: 31d5bdb8ee1d54c3f89e4f4479fe7cd2af8b4fc696c07bf7c0e09f9a9bce7ca248f1389edc90fdda1e12941d30cf2afa781d44913ad4f2d49aca4dfb798b5f93
+  data.tar.gz: 7c5eed98bcbffef0787d8cda426a55215f2dbca41f77686aefa32517d09ba9abb5b457c2750c9ac81b408aa46e636b5a4b78db1b3a9d987064203d7afd4c0a79

data/lib/foreman_debian/command/install.rb

@@ -16,6 +16,10 @@ module ForemanDebian
            :attribute_name => :working_dir,
            :default => Dir.getwd
 
+    option %w(-R --retry), '<timeout|schedule>', 'Timeout or schedule when stopping (see man start-stop-daemon)',
+           :attribute_name => :timeout_schedule,
+           :default => '20'
+
     def execute
       jobs = {}
       procfile.entries do |name, command|

data/lib/foreman_debian/initd/engine.rb

@@ -11,13 +11,13 @@ module ForemanDebian
         setup
       end
 
-      def create_script(name, command, user)
+      def create_script(name, command, user, timeout_schedule = '20')
         pidfile = pidfile(name)
         args = Shellwords.split(command)
         script = args.shift
         name = "#{@app}-#{name}"
         script_path = @export_path.join(name)
-        Script.new(script_path, name, name, user, script, args, pidfile)
+        Script.new(script_path, name, name, user, script, args, pidfile, timeout_schedule)
       end
 
       def install(script)

data/lib/foreman_debian/initd/script.rb

@@ -2,9 +2,9 @@ module ForemanDebian
   module Initd
    class Script < Template::Storage
 
-      attr_reader :path, :name, :description, :user, :script, :arguments, :pidfile
+      attr_reader :path, :name, :description, :user, :script, :arguments, :pidfile, :timeout_schedule
 
-      def initialize(path, name, description, user, script, arguments, pidfile)
+      def initialize(path, name, description, user, script, arguments, pidfile, timeout_schedule)
         @path = path
         @name = name
         @description = description
@@ -12,6 +12,7 @@ module ForemanDebian
         @script = script
         @arguments = arguments
         @pidfile = pidfile
+        @timeout_schedule = timeout_schedule
       end
 
       def render

data/templates/initd_script.erb

@@ -36,7 +36,7 @@ case "${1}" in
 	;;
 	stop)
 		log_daemon_msg "Stopping ${DESC}" "${NAME}"
-		if (start-stop-daemon --stop --oknodo --retry 20 --pidfile $PIDFILE --chuid $DAEMON_USER); then
+		if (start-stop-daemon --stop --oknodo --retry <%= Shellwords.escape timeout_schedule %> --pidfile $PIDFILE --chuid $DAEMON_USER); then
 			log_end_msg 0
 		else
 			log_end_msg 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_debian
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - cargomedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Foreman wrapper for debian