Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-13 00:17:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

runit_service: fix resource, improve integration tests

Browse source 
Turns out using `/usr/bin/yes` to imitate a daemon process is a TERRIBLE idea.
This commit is contained in:
Stephan Renatus 2016-01-29 17:03:05 +01:00
parent 605f879429
commit 6fbd28c2bb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/resources/service.rb
View file

@ -351,14 +351,15 @@ class Runit < ServiceManager
super super
end end
# rubocop:disable Style/DoubleNegation
def info(service_name) def info(service_name)
# get the status of runit service # get the status of runit service
cmd = inspec.command("#{service_ctl} status #{service_name}") cmd = inspec.command("#{service_ctl} status #{service_name}")
# return nil unless cmd.exit_status == 0 # NOTE(sr) why do we do this? # return nil unless cmd.exit_status == 0 # NOTE(sr) why do we do this?
installed = cmd.exit_status == 0 installed = cmd.exit_status == 0
running = installed && (cmd.stdout =~ /^run:/) running = installed && !!(cmd.stdout =~ /^run:/)
enabled = installed && (running || (cmd.stdout =~ /normally up/) || (cmd.stdout =~ /want up/)) enabled = installed && (running || !!(cmd.stdout =~ /normally up/) || !!(cmd.stdout =~ /want up/))
{ {
name: service_name, name: service_name,

3
test/integration/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb
View file

@ -1,3 +1,2 @@
#!/bin/sh #!/bin/sh
exec > /dev/null exec tail -f /dev/null
exec yes