...

Author: guettli

internal/robot/client/cache/client.go

@@ -90,7 +90,7 @@ func NewCachedRobotClient(rootDir string, httpClient *http.Client, baseURL strin
 
 func (c *cacheRobotClient) ServerGet(id int) (*models.Server, error) {
 	if c.shouldSync() {
-		if _, err := c.sync(); err != nil {
+		if _, err := c.ServerGetListForceRefresh(); err != nil {
 			return nil, err
 		}
 	}
@@ -106,15 +106,32 @@ func (c *cacheRobotClient) ServerGet(id int) (*models.Server, error) {
 
 func (c *cacheRobotClient) ServerGetList() ([]models.Server, error) {
 	if c.shouldSync() {
-		return c.sync()
+		return c.ServerGetListForceRefresh()
 	}
 
 	return c.l, nil
 }
 
 // ServerGetListForceRefresh bypasses the timeout check and reloads the cache from Robot.
 func (c *cacheRobotClient) ServerGetListForceRefresh() ([]models.Server, error) {
-	return c.sync()
+	list, err := c.robotClient.ServerGetList()
+	if err != nil {
+		return list, err
+	}
+
+	// populate list
+	c.l = list
+
+	// remove all entries from map and repopulate it from the current list
+	c.m = make(map[int]*models.Server)
+	for i, server := range list {
+		c.m[server.ServerNumber] = &list[i]
+	}
+
+	// set time of last update
+	c.lastUpdate = time.Now()
+
+	return c.l, nil
 }
 
 func (c *cacheRobotClient) shouldSync() bool {
@@ -138,24 +155,3 @@ func (c *cacheRobotClient) SetCredentials(username, password string) error {
 	c.m = nil
 	return nil
 }
-
-func (c *cacheRobotClient) sync() ([]models.Server, error) {
-	list, err := c.robotClient.ServerGetList()
-	if err != nil {
-		return list, err
-	}
-
-	// populate list
-	c.l = list
-
-	// remove all entries from map and repopulate it from the current list
-	c.m = make(map[int]*models.Server)
-	for i, server := range list {
-		c.m[server.ServerNumber] = &list[i]
-	}
-
-	// set time of last update
-	c.lastUpdate = time.Now()
-
-	return c.l, nil
-}