Solaris: sync SMF method script and XML description with PE

This adds contract handling and avoids going into maintenance state when there's a stale PID file at startup.
eric · Jan 9, 2011 · 9b4390a · 9b4390a
1 parent 0229da0
commit 9b4390a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/contrib/solaris-packaging/syslog-ng.example.xml b/contrib/solaris-packaging/syslog-ng.example.xml
@@ -64,7 +64,7 @@
     <exec_method
       type='method'
       name='restart'
-      exec='/lib/svc/method/syslog-ng %m'
+      exec='/lib/svc/method/syslog-ng %m %{restarter/contract}'
       timeout_seconds='60'>
       <method_context>
         <method_credential user='root' />
@@ -74,7 +74,7 @@
     <exec_method
       type='method'
       name='stop'
-      exec='/lib/svc/method/syslog-ng %m'
+      exec='/lib/svc/method/syslog-ng %m %{restarter/contract}'
       timeout_seconds='60' >
       <method_context>
         <method_credential user='root' />

diff --git a/contrib/solaris-packaging/syslog-ng.method b/contrib/solaris-packaging/syslog-ng.method
@@ -43,9 +43,16 @@ slng_waitforpid() {
 }
 
 slng_stop() {
-        [ -f $PIDFILE ] || return $SMF_EXIT_OK
-        syspid=`head -1 $PIDFILE`
+        # if we have a contract, we should simply use smf_kill_contract to terminate the process
+        if [ -n "$2" ]; then
+                smf_kill_contract $2 TERM 1 $MAXWAIT
+                [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+                return $SMF_EXIT_OK
+        fi
 
+        [ -f $PIDFILE ] || return $SMF_EXIT_ERR_FATAL
+
+        syspid=`head -1 $PIDFILE`
 
         [ -z "$syspid" ] && return $SMF_EXIT_OK
         kill -0 $syspid >/dev/null 2>&1
@@ -63,11 +70,7 @@ slng_stop() {
                 $_ret=$?
         fi
 
-        if [ $_ret -ne 0 ] ;then
-                if [ -n "$2" ];then
-                         smf_kill_contract "$2" TERM 10
-                        [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
-                fi
+        if [ $_ret -eq 0 ] ;then
                 rm -f $PIDFILE
                 if [ -h $SYSLOGPIDFILE ];then
                         rm -f $SYSLOGPIDFILE