Merge pull request #53 from Jimdo/puppet_provider

Implement starting/stopping/getting status of supervisor programs as a puppet provider

Author: Soeren

.gitignore

@@ -5,5 +5,6 @@
 spec/fixtures/
 Gemfile.lock
 .rspec-local
+.rbenv*
 .idea
 atlassian-ide-plugin.xml

lib/puppet/provider/service/supervisor.rb

@@ -0,0 +1,81 @@
+# Manage services using Supervisor.  Start/stop uses /sbin/service and enable/disable uses chkconfig
+
+Puppet::Type.type(:service).provide :supervisor, :parent => :base do
+
+  desc "Supervisor: A daemontools-like service monitor written in python"
+
+  commands :supervisorctl => "/usr/bin/supervisorctl"
+
+  def name_without_prefix
+    @resource[:name].gsub(/^supervisor::/, '')
+  end
+
+  def group_or_process_name
+    name_without_prefix
+  end
+
+  def supervisorctl_arg
+    name_without_prefix + ':*'
+  end
+
+  def status
+    begin
+      output = supervisorctl(:status)
+    rescue Puppet::ExecutionFailure
+      return :stopped
+    end
+
+    filtered_output = output.lines.grep /#{self.group_or_process_name}[ :]/
+    if filtered_output.empty?
+      return :stopped
+    end
+
+    status_is_starting = filtered_output.grep(/STARTING/)
+    unless status_is_starting.empty?
+      Puppet.warning "Could not reliably determine status: #{self.group_or_process_name} is still starting"
+    end
+
+    status_not_running = filtered_output.reject {|item| item =~ /RUNNING|STARTING/}
+    if status_not_running.empty?
+      return :running
+    end
+
+    :stopped
+  end
+
+  def restart
+    output = supervisorctl(:restart, self.supervisorctl_arg)
+
+    if output.include? 'ERROR (no such process)' or output.include? 'ERROR (abnormal termination)'
+      raise Puppet::Error, "Could not restart #{self.group_or_process_name}: #{output}"
+    end
+  end
+
+  def start
+    output = supervisorctl(:start, self.supervisorctl_arg)
+
+    if output.include? 'ERROR (no such process)' or output.include? 'ERROR (abnormal termination)'
+      raise Puppet::Error, "Could not start #{self.group_or_process_name}: #{output}"
+    end
+
+    filtered_output = output.lines.reject {|item| item.include? "ERROR (already started)"}
+
+    status_not_started = filtered_output.reject {|item| item =~ /started$/}
+    unless status_not_started.empty?
+      raise Puppet::Error, "Could not start #{self.group_or_process_name}: #{output}"
+    end
+  end
+
+  def stop
+    output = supervisorctl(:stop, self.supervisorctl_arg)
+
+    if output.include? 'ERROR (no such process)'
+      raise Puppet::Error, "Could not stop #{self.group_or_process_name}: #{output}"
+    end
+
+    if output =~ /^error/
+      raise Puppet::Error, "Could not stop #{self.group_or_process_name}: #{output}"
+    end
+  end
+
+end

manifests/service.pp

@@ -77,20 +77,24 @@
     require => Class['supervisor'],
   }
 
-  file { "${supervisor::conf_dir}/${name}${supervisor::conf_ext}":
+  $conf_file = "${supervisor::conf_dir}/${name}${supervisor::conf_ext}"
+
+  file { $conf_file:
     ensure  => $config_ensure,
     content => template('supervisor/service.ini.erb'),
-    require => File["/var/log/supervisor/${name}"],
-    notify  => Class['supervisor::update'],
   }
 
   service { "supervisor::${name}":
     ensure   => $service_ensure,
-    provider => base,
-    restart  => "/usr/bin/supervisorctl restart ${process_name} | awk '/^${name}[: ]/{print \$2}' | grep -Pzo '^stopped\\nstarted$'",
-    start    => "/usr/bin/supervisorctl start ${process_name} | awk '/^${name}[: ]/{print \$2}' | grep '^started$'",
-    status   => "/usr/bin/supervisorctl status | awk '/^${name}[: ]/{print \$2}' | grep '^RUNNING$'",
-    stop     => "/usr/bin/supervisorctl stop ${process_name} | awk '/^${name}[: ]/{print \$2}' | grep '^stopped$'",
-    require  => [Class['supervisor::update'], File["${supervisor::conf_dir}/${name}${supervisor::conf_ext}"]],
+    provider => supervisor,
+  }
+
+  if $ensure == 'present' {
+    File["/var/log/supervisor/${name}"] -> File[$conf_file] ~>
+    Class['supervisor::update'] -> Service["supervisor::${name}"]
+  } else { # $ensure == 'absent'
+    # First stop the service, delete the .ini, reload the config, delete the log dir
+    Service["supervisor::${name}"] -> File[$conf_file] ~>
+    Class['supervisor::update'] -> File["/var/log/supervisor/${name}"]
   }
 }

spec/defines/service_spec.rb

@@ -42,6 +42,18 @@ class { 'supervisor':
       should create_file('/etc/supervisor/sometitle.ini') \
           .with_content(Regexp.new Regexp.escape 'command=somecommand')
     end
+
+    context "with ensure => absent" do
+      let (:params) { {
+        :command => 'somecommand',
+        :ensure => 'absent',
+      } }
+
+      it "should delete config and log dir" do
+        should contain_file('/etc/supervisor/sometitle.ini').with_ensure('absent')
+        should contain_file('/var/log/supervisor/sometitle').with_ensure('absent')
+      end
+    end
   end
 
 end