Browse code

Merge "Revert "Exit after printing error about RPC config""

Jenkins authored on 2015/01/30 07:56:32
Showing 1 changed files
... ...
@@ -54,15 +54,13 @@ function check_rpc_backend {
54 54
         (( rpc_backend_cnt++ )) || true
55 55
     done
56 56
     if [ "$rpc_backend_cnt" -gt 1 ]; then
57
-        die $LINENO \
58
-            "Only one rpc backend may be enabled, " \
59
-            "set only one of 'rabbit', 'qpid', 'zeromq' " \
60
-            "via ENABLED_SERVICES."
57
+        echo "ERROR: only one rpc backend may be enabled,"
58
+        echo "       set only one of 'rabbit', 'qpid', 'zeromq'"
59
+        echo "       via ENABLED_SERVICES."
61 60
     elif [ "$rpc_backend_cnt" == 0 ] && [ "$rpc_needed" == 0 ]; then
62
-        die $LINENO \
63
-            "at least one rpc backend must be enabled, " \
64
-            "set one of 'rabbit', 'qpid', 'zeromq'" \
65
-            "via ENABLED_SERVICES."
61
+        echo "ERROR: at least one rpc backend must be enabled,"
62
+        echo "       set one of 'rabbit', 'qpid', 'zeromq'"
63
+        echo "       via ENABLED_SERVICES."
66 64
     fi
67 65
 
68 66
     if is_service_enabled qpid && ! qpid_is_supported; then