Skip to content

Commit 9b9b934

Browse files
author
Emilien Macchi
committed
heat-engine: fix AMQP check
On the last commit, I inserted an error with zeromq condition. This patch fix it. Signed-off-by: Emilien Macchi <[email protected]>
1 parent 42c4dc3 commit 9b9b934

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

ocf/heat-engine

+3-5
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,12 @@ heat_engine_monitor() {
235235

236236
# Check the connections according to the PID.
237237
# We are sure to hit the heat-engine process and not other heat process with the same connection behavior (for example heat-api)
238-
if ocf_is_true "$OCF_RESKEY_zeromq"; then
239238
pid=`cat $OCF_RESKEY_pid`
240239
engine_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"`
241240
rc_amqp=$?
242-
if [ $rc_amqp -ne 0 ]; then
243-
ocf_log err "Heat Engine is not connected to the AMQP server: AMQP connection test returned $rc_amqp"
244-
return $OCF_NOT_RUNNING
245-
fi
241+
if [ $rc_amqp -ne 0 ]; then
242+
ocf_log err "Heat Engine is not connected to the AMQP server: AMQP connection test returned $rc_amqp"
243+
return $OCF_NOT_RUNNING
246244
fi
247245

248246
ocf_log debug "OpenStack Orchestration Engine (heat-engine) monitor succeeded"

0 commit comments

Comments
 (0)