From df6ce917c2253c3ff80e725444d24844c7fc7a1c Mon Sep 17 00:00:00 2001
From: LPowlett <44359672+LPowlett@users.noreply.github.com>
Date: Mon, 28 Jan 2019 11:03:54 +0000
Subject: [PATCH] endmqm -r try to reconnect (#268)

---
 cmd/runmqserver/qmgr.go      | 2 +-
 test/docker/mqmetric_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/runmqserver/qmgr.go b/cmd/runmqserver/qmgr.go
index 8d6e76c..0082e14 100644
--- a/cmd/runmqserver/qmgr.go
+++ b/cmd/runmqserver/qmgr.go
@@ -131,7 +131,7 @@ func configureQueueManager() error {
 
 func stopQueueManager(name string) error {
 	log.Println("Stopping queue manager")
-	out, _, err := command.Run("endmqm", "-w", name)
+	out, _, err := command.Run("endmqm", "-w", "-r", name)
 	if err != nil {
 		log.Printf("Error stopping queue manager: %v", string(out))
 		return err
diff --git a/test/docker/mqmetric_test.go b/test/docker/mqmetric_test.go
index cb3d67e..6f08056 100644
--- a/test/docker/mqmetric_test.go
+++ b/test/docker/mqmetric_test.go
@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -279,7 +279,7 @@ func TestQMRestart(t *testing.T) {
 
 	// Restart just the QM (to simulate a lost connection)
 	t.Log("Stopping queue manager\n")
-	rc, out := execContainer(t, cli, id, "mqm", []string{"endmqm", "-w", defaultMetricQMName})
+	rc, out := execContainer(t, cli, id, "mqm", []string{"endmqm", "-w", "-r", defaultMetricQMName})
 	if rc != 0 {
 		t.Fatalf("Failed to stop the queue manager. rc=%d, err=%s", rc, out)
 	}