summaryrefslogtreecommitdiffstats
path: root/lib/puppet/provider/service/daemontools.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/provider/service/daemontools.rb')
-rw-r--r--lib/puppet/provider/service/daemontools.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/puppet/provider/service/daemontools.rb b/lib/puppet/provider/service/daemontools.rb
index f5f2607e3..934e96aea 100644
--- a/lib/puppet/provider/service/daemontools.rb
+++ b/lib/puppet/provider/service/daemontools.rb
@@ -125,16 +125,14 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
end
def setupservice
- begin
if resource[:manifest]
Puppet.notice "Configuring #{resource[:name]}"
command = [ resource[:manifest], resource[:name] ]
#texecute("setupservice", command)
rv = system("#{command}")
end
- rescue Puppet::ExecutionFailure => detail
+ rescue Puppet::ExecutionFailure => detail
raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}" )
- end
end
def enabled?
@@ -149,7 +147,6 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
end
def enable
- begin
if ! FileTest.directory?(self.daemon)
Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
self.setupservice
@@ -160,9 +157,8 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
File.symlink(self.daemon, self.service)
end
end
- rescue Puppet::ExecutionFailure => detail
+ rescue Puppet::ExecutionFailure => detail
raise Puppet::Error.new( "No daemon directory found for #{self.service}")
- end
end
def disable