Add retry capability

README.md

@@ -11,7 +11,7 @@ If all goes fine, later this repository will provide you both a GoLang SDK and a
 
 ## TODOs
 * [ ] Create json output for machines. Improve documentation accordingly.
-* [ ] Add retries. `status` command produces `PORT_ERROR` quite frequently while second try works fine.
+* [x] Add retries. `status` command produces `PORT_ERROR` quite frequently while second try works fine.
 * [x] Improve token handling. Token is stored in `config.yaml` but it seems to be invalidated after a while. It should be renewed on demand.
 
 ## Usage

cli/cmd/consts.go

@@ -21,4 +21,5 @@ const (
  LogoutCmdName = "logout"
  PingCmdName = "ping"
  TokenExpirationTime = time.Minute * 5
+ retryCount = 3
 )

cli/cmd/getName.go

@@ -52,9 +52,15 @@ func GetName(localMac, mac [6]byte, host string, port int, token uint32) error {
  }
  }()
 
- name, err := client.GetName()
+ var name string
+ err = retry(func() error {
+ var err2 error
+ name, err2 = client.GetName()
+ return err2
+ })
+
  if err != nil {
- return err
+ return nil
  }
 
  log.Infof("Received name: %s", name)

cli/cmd/groups.go

@@ -54,7 +54,13 @@ func listGroups(localMac [6]byte, mac [6]byte, host string, port int, token uint
  }
  }()
 
- groups, err := client.GetGroups()
+ var groups *sdk.Groups
+ err = retry(func() error {
+ var err2 error
+ groups, err2 = client.GetGroups()
+ return err2
+ })
+
  if err != nil {
  return err
  }

cli/cmd/retry.go

@@ -0,0 +1,15 @@
+package cmd
+
+func retry(f func() error) error {
+ var err error
+
+ for i := 0; i < retryCount; i++ {
+ err = f()
+ if err == nil {
+ break
+ }
+ log.Debugf("Retriable error: %v", err)
+ }
+
+ return err
+}

cli/cmd/setState.go

@@ -57,7 +57,11 @@ func setStatus(localMac [6]byte, mac [6]byte, host string, port int, devicePort
  }
  }()
 
- err = client.SetState(devicePort)
+ err = retry(func() error {
+ err2 := client.SetState(devicePort)
+ return err2
+ })
+
  if err != nil {
  return err
  }

cli/cmd/status.go

@@ -3,6 +3,7 @@ package cmd
 import (
  "bisecure/cli"
  "bisecure/sdk"
+ "bisecure/sdk/payload"
  "github.com/spf13/viper"
  "os"
 
@@ -57,7 +58,13 @@ func getStatus(localMac [6]byte, mac [6]byte, host string, port int, devicePort
  }
  }()
 
- status, err := client.GetTransition(devicePort)
+ var status *payload.HmGetTransitionResponse
+ err = retry(func() error {
+ var err2 error
+ status, err2 = client.GetTransition(devicePort)
+ return err2
+ })
+
  if err != nil {
  return err
  }

cli/cmd/users.go

@@ -54,7 +54,13 @@ func listUsers(localMac [6]byte, mac [6]byte, host string, port int, token uint3
  }
  }()
 
- users, err := client.GetUsers()
+ var users *sdk.Users
+ err = retry(func() error {
+ var err2 error
+ users, err2 = client.GetUsers()
+ return err2
+ })
+
  if err != nil {
  return err
  }