Update init.d scripts to check if datadog config is present before st…

…arting. Fix #544
DataDog · Jun 14, 2013 · abf09e3 · abf09e3
1 parent 3c8d481
commit abf09e3
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 0 deletions.
diff --git a/packaging/datadog-agent-base-deb/datadog-agent.init b/packaging/datadog-agent-base-deb/datadog-agent.init
@@ -14,6 +14,7 @@
 PATH=$PATH:/sbin # add the location of start-stop-daemon on Debian
 
 AGENTPATH="/usr/bin/dd-agent"
+AGENTCONF="/etc/dd-agent/datadog.conf"
 DOGSTATSDPATH="/usr/bin/dogstatsd"
 AGENTUSER="dd-agent"
 USE_SUPERVISOR="/usr/bin/dd-forwarder"
@@ -33,6 +34,11 @@ if [ ! -x $AGENTPATH ]; then
     exit 0
 fi
 
+if [ ! -f $AGENTCONF ]; then
+    echo "$AGENTCONF not found. Exiting."
+    exit 3
+fi
+
 check_status() {
     if [ -f $USE_SUPERVISOR ]; then
         # If the socket exists, we can use supervisorctl

diff --git a/packaging/datadog-agent-base-deb/postinst b/packaging/datadog-agent-base-deb/postinst
@@ -29,11 +29,24 @@ case "$1" in
         chown -h root:root /usr/bin/dogstatsd
         chown -h root:root /usr/bin/dd-agent
 
+        set +e
+
         if which invoke-rc.d >/dev/null 2>&1; then
             invoke-rc.d datadog-agent restart
         else
             /etc/init.d/datadog-agent restart
         fi
+
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+            if [ $RETVAL -eq 3 ]; then
+                # No datadog.conf file is present. The user is probably following
+                # the step-by-step instructions and will add the config file next.
+                exit 0
+            else
+                exit $RETVAL
+            fi
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/packaging/datadog-agent-base-rpm/datadog-agent-redhat b/packaging/datadog-agent-base-rpm/datadog-agent-redhat
@@ -23,6 +23,7 @@
 ### END INIT INFO
 
 AGENTPATH="/usr/share/datadog/agent/agent.py"
+AGENTCONF="/etc/dd-agent/datadog.conf"
 DOGSTATSDPATH="/usr/share/datadog/agent/dogstatsd.py"
 AGENTUSER="dd-agent"
 PIDPATH="/var/run/dd-agent/"
@@ -35,6 +36,11 @@ else
     PYTHON="/usr/bin/python"
 fi
 
+if [ ! -f $AGENTCONF ]; then
+    echo "$AGENTCONF not found. Exiting."
+    exit 3
+fi
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 

diff --git a/packaging/datadog-agent-base-rpm/post_install b/packaging/datadog-agent-base-rpm/post_install
@@ -3,4 +3,15 @@ chown -R dd-agent /var/log/datadog/
 chkconfig --add datadog-agent
 
 /etc/init.d/datadog-agent restart
+RETVAL=$?
+if [ $RETVAL -ne 0 ]; then
+    if [ $RETVAL -eq 3 ]; then
+        # No datadog.conf file is present. The user is probably following
+        # the step-by-step instructions and will add the config file next.
+        exit 0
+    else
+        exit $RETVAL
+    fi
+fi
+
 exit 0
diff --git a/packaging/datadog-agent-deb/postinst b/packaging/datadog-agent-deb/postinst
@@ -14,11 +14,24 @@ case "$1" in
         chown -h root:root /usr/bin/dd-agent
         chown -h root:root /usr/bin/dd-forwarder
 
+        set +e
+
         if which invoke-rc.d >/dev/null 2>&1; then
             invoke-rc.d datadog-agent restart
         else
             /etc/init.d/datadog-agent restart
         fi
+
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+          if [ $RETVAL -eq 3 ]; then
+            # No datadog.conf file is present. The user is probably following
+            # the step-by-step instructions and will add the config file next.
+            exit 0
+          else
+            exit $?
+          fi
+        fi
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;

diff --git a/packaging/datadog-agent-rpm/postinst b/packaging/datadog-agent-rpm/postinst
@@ -4,4 +4,15 @@ chown -R dd-agent /var/log/datadog/
 chkconfig --add datadog-agent
 
 /etc/init.d/datadog-agent restart
+RETVAL=$?
+if [ $RETVAL -ne 0 ]; then
+    if [ $RETVAL -eq 3 ]; then
+        # No datadog.conf file is present. The user is probably following
+        # the step-by-step instructions and will add the config file next.
+        exit 0
+    else
+        exit $RETVAL
+    fi
+fi
+
 exit 0