From 51fdae45987c836e39b3e18b9a021d7dba621781 Mon Sep 17 00:00:00 2001
From: Benjamin Wenger <ben@elixxir.ioo>
Date: Thu, 6 May 2021 23:54:46 -0700
Subject: [PATCH] made stop network follower always allow restart
---
api/client.go | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/api/client.go b/api/client.go
index 9068708d0..118615bdc 100644
--- a/api/client.go
+++ b/api/client.go
@@ -435,15 +435,16 @@ func (c *Client) StopNetworkFollower(timeout time.Duration) error {
return errors.WithMessage(err, "Failed to Stop the Network Follower")
}
err = c.runner.Close(timeout)
- if err != nil {
- return errors.WithMessage(err, "Failed to Stop the Network Follower")
- }
c.runner = stoppable.NewMulti("client")
- err = c.status.toStopped()
- if err != nil {
- return errors.WithMessage(err, "Failed to Stop the Network Follower")
+ err2 := c.status.toStopped()
+ if err2 != nil {
+ if err ==nil{
+ err = err2
+ }else{
+ err = errors.WithMessage(err,err2.Error())
+ }
}
- return nil
+ return err
}
// NetworkFollowerStatus Gets the state of the network follower. Returns:
--
GitLab