foreman_debian 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d36c851de35ae04015e73084baa78e2db1fe9656
-  data.tar.gz: e49cab29d9fc6700bf3c331a941a03bd99b3fd69
+  metadata.gz: b7b696cb0864780aaf68e012e5f215ef9bb19521
+  data.tar.gz: 3976cb5605206aa77b247756e4514b3c3b0d8c3e
 SHA512:
-  metadata.gz: 31d5bdb8ee1d54c3f89e4f4479fe7cd2af8b4fc696c07bf7c0e09f9a9bce7ca248f1389edc90fdda1e12941d30cf2afa781d44913ad4f2d49aca4dfb798b5f93
-  data.tar.gz: 7c5eed98bcbffef0787d8cda426a55215f2dbca41f77686aefa32517d09ba9abb5b457c2750c9ac81b408aa46e636b5a4b78db1b3a9d987064203d7afd4c0a79
+  metadata.gz: 9266b0197efd3225e673ed3d91093db740f525c7d066d6d2f126b0c60697b2d29764245d92b8f203c4211290bc0492a3feabc38d8d6c35e3c1d12a1dbba3110f
+  data.tar.gz: 79d339eee92c722b973569e8bea51a5cf828c204a9836f46942480617fe92af2905dcffb41368484eae618cc7763d2e787abd6ed04bd700ced1547e4b21d412f

data/lib/foreman_debian/command/install.rb

@@ -16,10 +16,6 @@ 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, timeout_schedule = '20')
+      def create_script(name, command, user)
         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, timeout_schedule)
+        Script.new(script_path, name, name, user, script, args, pidfile)
       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, :timeout_schedule
+      attr_reader :path, :name, :description, :user, :script, :arguments, :pidfile
 
-      def initialize(path, name, description, user, script, arguments, pidfile, timeout_schedule)
+      def initialize(path, name, description, user, script, arguments, pidfile)
         @path = path
         @name = name
         @description = description
@@ -12,7 +12,6 @@ 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 <%= Shellwords.escape timeout_schedule %> --pidfile $PIDFILE --chuid $DAEMON_USER); then
+		if (start-stop-daemon --stop --oknodo --retry TERM/20/TERM/20 --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.11
+  version: 0.0.12
 platform: ruby
 authors:
 - cargomedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp