foreman_debian 0.0.11 → 0.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d36c851de35ae04015e73084baa78e2db1fe9656
4
- data.tar.gz: e49cab29d9fc6700bf3c331a941a03bd99b3fd69
3
+ metadata.gz: b7b696cb0864780aaf68e012e5f215ef9bb19521
4
+ data.tar.gz: 3976cb5605206aa77b247756e4514b3c3b0d8c3e
5
5
  SHA512:
6
- metadata.gz: 31d5bdb8ee1d54c3f89e4f4479fe7cd2af8b4fc696c07bf7c0e09f9a9bce7ca248f1389edc90fdda1e12941d30cf2afa781d44913ad4f2d49aca4dfb798b5f93
7
- data.tar.gz: 7c5eed98bcbffef0787d8cda426a55215f2dbca41f77686aefa32517d09ba9abb5b457c2750c9ac81b408aa46e636b5a4b78db1b3a9d987064203d7afd4c0a79
6
+ metadata.gz: 9266b0197efd3225e673ed3d91093db740f525c7d066d6d2f126b0c60697b2d29764245d92b8f203c4211290bc0492a3feabc38d8d6c35e3c1d12a1dbba3110f
7
+ data.tar.gz: 79d339eee92c722b973569e8bea51a5cf828c204a9836f46942480617fe92af2905dcffb41368484eae618cc7763d2e787abd6ed04bd700ced1547e4b21d412f
@@ -16,10 +16,6 @@ module ForemanDebian
16
16
  :attribute_name => :working_dir,
17
17
  :default => Dir.getwd
18
18
 
19
- option %w(-R --retry), '<timeout|schedule>', 'Timeout or schedule when stopping (see man start-stop-daemon)',
20
- :attribute_name => :timeout_schedule,
21
- :default => '20'
22
-
23
19
  def execute
24
20
  jobs = {}
25
21
  procfile.entries do |name, command|
@@ -11,13 +11,13 @@ module ForemanDebian
11
11
  setup
12
12
  end
13
13
 
14
- def create_script(name, command, user, timeout_schedule = '20')
14
+ def create_script(name, command, user)
15
15
  pidfile = pidfile(name)
16
16
  args = Shellwords.split(command)
17
17
  script = args.shift
18
18
  name = "#{@app}-#{name}"
19
19
  script_path = @export_path.join(name)
20
- Script.new(script_path, name, name, user, script, args, pidfile, timeout_schedule)
20
+ Script.new(script_path, name, name, user, script, args, pidfile)
21
21
  end
22
22
 
23
23
  def install(script)
@@ -2,9 +2,9 @@ module ForemanDebian
2
2
  module Initd
3
3
  class Script < Template::Storage
4
4
 
5
- attr_reader :path, :name, :description, :user, :script, :arguments, :pidfile, :timeout_schedule
5
+ attr_reader :path, :name, :description, :user, :script, :arguments, :pidfile
6
6
 
7
- def initialize(path, name, description, user, script, arguments, pidfile, timeout_schedule)
7
+ def initialize(path, name, description, user, script, arguments, pidfile)
8
8
  @path = path
9
9
  @name = name
10
10
  @description = description
@@ -12,7 +12,6 @@ module ForemanDebian
12
12
  @script = script
13
13
  @arguments = arguments
14
14
  @pidfile = pidfile
15
- @timeout_schedule = timeout_schedule
16
15
  end
17
16
 
18
17
  def render
@@ -36,7 +36,7 @@ case "${1}" in
36
36
  ;;
37
37
  stop)
38
38
  log_daemon_msg "Stopping ${DESC}" "${NAME}"
39
- if (start-stop-daemon --stop --oknodo --retry <%= Shellwords.escape timeout_schedule %> --pidfile $PIDFILE --chuid $DAEMON_USER); then
39
+ if (start-stop-daemon --stop --oknodo --retry TERM/20/TERM/20 --pidfile $PIDFILE --chuid $DAEMON_USER); then
40
40
  log_end_msg 0
41
41
  else
42
42
  log_end_msg 1
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_debian
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - cargomedia
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-09-25 00:00:00.000000000 Z
12
+ date: 2014-10-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: clamp