Browse code
Exit after printing error about RPC config
When finding an invalid RPC configuration, devstack prints
a suitable error in the logs
ERROR: only one rpc backend may be enabled,
set only one of 'rabbit', 'qpid', 'zeromq'
via ENABLED_SERVICES.
but then just carries on running, as a result the developer
is very unlikely to ever see the original error message.
Change the 'echo' to a 'die' so that it stop immediately
making the error message clearly visible.
Change-Id: If108f314e1ad2ecc79f41cbca47d08c4024a23cd
Daniel P. Berrange authored on 2015/01/22 23:09:00Showing 1 changed files
| ... | ... |
@@ -54,13 +54,15 @@ function check_rpc_backend {
|
| 54 | 54 |
(( rpc_backend_cnt++ )) || true |
| 55 | 55 |
done |
| 56 | 56 |
if [ "$rpc_backend_cnt" -gt 1 ]; then |
| 57 |
- echo "ERROR: only one rpc backend may be enabled," |
|
| 58 |
- echo " set only one of 'rabbit', 'qpid', 'zeromq'" |
|
| 59 |
- echo " via ENABLED_SERVICES." |
|
| 57 |
+ die $LINENO \ |
|
| 58 |
+ "Only one rpc backend may be enabled, " \ |
|
| 59 |
+ "set only one of 'rabbit', 'qpid', 'zeromq' " \ |
|
| 60 |
+ "via ENABLED_SERVICES." |
|
| 60 | 61 |
elif [ "$rpc_backend_cnt" == 0 ] && [ "$rpc_needed" == 0 ]; then |
| 61 |
- echo "ERROR: at least one rpc backend must be enabled," |
|
| 62 |
- echo " set one of 'rabbit', 'qpid', 'zeromq'" |
|
| 63 |
- echo " via ENABLED_SERVICES." |
|
| 62 |
+ die $LINENO \ |
|
| 63 |
+ "at least one rpc backend must be enabled, " \ |
|
| 64 |
+ "set one of 'rabbit', 'qpid', 'zeromq'" \ |
|
| 65 |
+ "via ENABLED_SERVICES." |
|
| 64 | 66 |
fi |
| 65 | 67 |
|
| 66 | 68 |
if is_service_enabled qpid && ! qpid_is_supported; then |