Don't try to stop datadog-agent with supervisor if not supervised (#65)

DataDog · Jun 7, 2012 · 7650646 · 7650646
1 parent 231d298
commit 7650646
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packaging/datadog-agent-base/deb/datadog-agent.init b/packaging/datadog-agent-base/deb/datadog-agent.init
@@ -54,8 +54,15 @@ case "$1" in
 
         echo -n "Stopping $DESC: "
         if [ -f $USE_SUPERVISOR ]; then
-            echo -n "(using supervisorctl) "
-            supervisorctl stop datadog-agent:*
+	    # Prevent errors if not under actual supervision
+            supervised=$(supervisorctl avail | grep datadog-agent | wc -l)
+	    if [ $supervised -gt 1 ]; then
+            	echo -n "(using supervisorctl) "
+            	supervisorctl stop datadog-agent:*
+	    else
+		# Should have been
+                echo -n "(warning: datadog-agent supervisor config is missing) "
+            fi
         else
             su $AGENTUSER -c "$AGENTPATH stop init"
         fi