Fix bug in setting up RABBITMQ_PID_FILE as well as printing multi-line warnings and errors

Author: lukebakken

scripts/rabbitmq-env

@@ -47,17 +47,32 @@ fi
 
 _rmq_env_now()
 {
-    date '+%Y-%m-%d %X'
+    date '+%Y-%m-%d %H:%M:%S'
+}
+
+_rmq_env_print()
+{
+    _rmq_env_tmp="$1"
+    shift
+    printf '%s %s %s\n' "$(_rmq_env_now)" "$_rmq_env_tmp" "$1" 1>&2
+    shift
+    _rmq_env_print_line=''
+    for _rmq_env_print_line in "$@"
+    do
+        printf '                              %s\n' "$_rmq_env_print_line" 1>&2
+    done
+    unset _rmq_env_print_line
+    unset _rmq_env_tmp
 }
 
 _rmq_env_perr()
 {
-    echo "$(_rmq_env_now) [error] $*" 1>&2
+    _rmq_env_print '[error]  ' "$@"
 }
 
 _rmq_env_pwarn()
 {
-    echo "$(_rmq_env_now) [warning] $*" 1>&2
+    _rmq_env_print '[warning]' "$@"
 }
 
 rmq_realpath() {
@@ -238,12 +253,12 @@ rmq_normalize_path_var \
 
 [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE="$PID_FILE"
 
-if [ -n "$saved_RABBITMQ_PID_FILE" ] && [ -n "$RABBITMQ_PID_FILE" ] && \
+if [ -n "$saved_RABBITMQ_PID_FILE" ] && \
     [ "$saved_RABBITMQ_PID_FILE" != "$RABBITMQ_PID_FILE" ]
 then
-    _rmq_env_pwarn "RABBITMQ_PID_FILE was already set by the init script to:\n" \
-        "                               $saved_RABBITMQ_PID_FILE\n" \
-        "                             The value set in rabbitmq-env.conf is ignored because it would break the init script."
+    _rmq_env_pwarn 'RABBITMQ_PID_FILE was already set by the init script to:' \
+        "$saved_RABBITMQ_PID_FILE" \
+        'The value set in rabbitmq-env.conf is ignored because it would break the init script.'
 
     RABBITMQ_PID_FILE="$saved_RABBITMQ_PID_FILE"
 fi

scripts/rabbitmq-server

@@ -93,12 +93,10 @@ RABBITMQ_CONFIG_FILE_NOEX=$(get_noex ${RABBITMQ_CONFIG_FILE})
 if [ "${RABBITMQ_CONFIG_FILE_NOEX}" = "${RABBITMQ_CONFIG_FILE}" ]; then
     if [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.config" ]; then
         if [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.conf" ]; then
-            # Both files exist. Print a warning
-            _rmq_env_pwarn "Both old (.config) and new (.conf) format config files exist.\n" \
-                "                            " \
-                "Using the old format config file: ${RABBITMQ_CONFIG_FILE_NOEX}.config\n" \
-                "                            " \
-                "Please update your config files to the new format and remove the old file"
+            # Both files exist. Print a warning.
+            _rmq_env_pwarn 'Both old (.config) and new (.conf) format config files exist.' \
+                "Using the old format config file: ${RABBITMQ_CONFIG_FILE_NOEX}.config" \
+                'Please update your config files to the new format and remove the old file.'
         fi
         RABBITMQ_CONFIG_FILE="${RABBITMQ_CONFIG_FILE_NOEX}.config"
     elif [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.conf" ]; then
@@ -127,25 +125,22 @@ elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
 elif [ "x" != "x${RABBITMQ_CONFIG_FILE}" \
        -a  "${RABBITMQ_CONFIG_FILE_NOEX}" != "${RABBITMQ_CONFIG_FILE}" ]; then
     # Config file has an extension, but it's neither .conf or .config
-    _rmq_env_perr "Wrong extension for RABBITMQ_CONFIG_FILE: ${RABBITMQ_CONFIG_FILE}\n" \
-        "                          " \
-        "The extension should be either .conf or .config"
+    _rmq_env_perr "Wrong extension for RABBITMQ_CONFIG_FILE: ${RABBITMQ_CONFIG_FILE}" \
+        'The extension should be either .conf or .config'
     exit 64 # EX_USAGE
 fi
 
 RABBITMQ_CONFIG_ARG_FILE_NOEX=$(get_noex ${RABBITMQ_CONFIG_ARG_FILE})
 
 if [ "${RABBITMQ_CONFIG_ARG_FILE_NOEX}.config" != "${RABBITMQ_CONFIG_ARG_FILE}" ]; then
     if [ "${RABBITMQ_CONFIG_ARG_FILE}" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
-        _rmq_env_perr "Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: ${RABBITMQ_ADVANCED_CONFIG_FILE}\n" \
-            "                          " \
-            "The extension should be .config"
+        _rmq_env_perr "Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: ${RABBITMQ_ADVANCED_CONFIG_FILE}" \
+            'The extension should be .config'
         exit 64 # EX_USAGE
     else
         # We should never got here, but still there should be some explanation
-        _rmq_env_perr "Wrong extension for ${RABBITMQ_CONFIG_ARG_FILE}\n" \
-            "                          " \
-            "The extension should be .config"
+        _rmq_env_perr "Wrong extension for ${RABBITMQ_CONFIG_ARG_FILE}"
+            'The extension should be .config'
         exit 64 # EX_USAGE
     fi
 fi