Fix cache time expiration

clawio · Jan 26, 2017 · b9aa9cc · b9aa9cc
1 parent fcd2c67
commit b9aa9cc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/cmd/clawiod/server.go b/cmd/clawiod/server.go
@@ -45,7 +45,6 @@ func newServer(config root.Configuration) (*server, error) {
 			s.logger.Error().Log("error", "error registering node")
 		}
 		for range time.Tick(time.Second * 5) {
-			s.logger.Info().Log("msg", "keep alive is issued every 5 seconds: re-registering node")
 			err = s.registerNode()
 			if err != nil {
 				s.logger.Error().Log("error", "error registering node")

diff --git a/root/authenticationwebserviceclient/authenticationwebserviceclient.go b/root/authenticationwebserviceclient/authenticationwebserviceclient.go
@@ -32,6 +32,7 @@ func New(logger levels.Levels, cm root.ContextManager, registryDriver root.Regis
 func (c *webServiceClient) getAuthenticationURL(ctx context.Context) (string, error) {
 	u, ok := c.cache.Get("url")
 	if ok {
+		c.logger.Info().Log("msg", "authentication-node chosen from cache", "authentication-node-url", u.(string))
 		return u.(string), nil
 	}
 
@@ -51,7 +52,7 @@ func (c *webServiceClient) getAuthenticationURL(ctx context.Context) (string, er
 	chosenNode := nodes[rand.Intn(len(nodes))]
 	c.logger.Info().Log("msg", "authentication-node chosen", "authentication-node-url", chosenNode.URL())
 	chosenURL := chosenNode.URL() + "/auth"
-	c.cache.Set("url", chosenURL, cache.NoExpiration)
+	c.cache.Set("url", chosenURL, cache.DefaultExpiration)
 	return chosenURL, nil
 }
 

diff --git a/root/datawebserviceclient/datawebserviceclient.go b/root/datawebserviceclient/datawebserviceclient.go
@@ -31,6 +31,7 @@ func New(logger levels.Levels, cm root.ContextManager, registryDriver root.Regis
 func (c *webServiceClient) getDataURL(ctx context.Context) (string, error) {
 	u, ok := c.cache.Get("url")
 	if ok {
+		c.logger.Info().Log("msg", "data-node chosen from cache", "data-node-url", u.(string))
 		return u.(string), nil
 	}
 
@@ -50,7 +51,7 @@ func (c *webServiceClient) getDataURL(ctx context.Context) (string, error) {
 	chosenNode := nodes[rand.Intn(len(nodes))]
 	c.logger.Info().Log("msg", "data-node chosen", "data-node-url", chosenNode.URL())
 	chosenURL := chosenNode.URL() + "/data"
-	c.cache.Set("url", chosenURL, cache.NoExpiration)
+	c.cache.Set("url", chosenURL, cache.DefaultExpiration)
 	return chosenURL, nil
 }
 func (c *webServiceClient) UploadFile(ctx context.Context, user root.User, path string, r io.ReadCloser, clientChecksum string) error {

diff --git a/root/metadatawebserviceclient/metadatawebserviceclient.go b/root/metadatawebserviceclient/metadatawebserviceclient.go
@@ -30,6 +30,7 @@ func New(logger levels.Levels, cm root.ContextManager, registryDriver root.Regis
 func (c *webServiceClient) getMetaDataURL(ctx context.Context) (string, error) {
 	u, ok := c.cache.Get("url")
 	if ok {
+		c.logger.Info().Log("msg", "metadata-node chosen from cache", "metadata-node-url", u.(string))
 		return u.(string), nil
 	}
 
@@ -49,6 +50,7 @@ func (c *webServiceClient) getMetaDataURL(ctx context.Context) (string, error) {
 	chosenNode := nodes[rand.Intn(len(nodes))]
 	c.logger.Info().Log("msg", "metadata-node chosen", "metadata-node-url", chosenNode.URL())
 	chosenURL := chosenNode.URL() + "/meta"
+	c.cache.Set("url", chosenURL, cache.DefaultExpiration)
 	return chosenURL, nil
 }
 
@@ -263,12 +265,12 @@ func (c *webServiceClient) CreateFolder(ctx context.Context, user root.User, pat
 		return err
 	}
 
-	if res.StatusCode == http.StatusCreated {
+	if res.StatusCode == http.StatusOK {
 		return nil
 	}
 
 	c.logger.Error().Log("error", "error creating folder on remote", "httpstatuscode", res.StatusCode)
-	return internalError(fmt.Sprintf("error creating folder on remote"))
+	return internalError("error creating folder on remote")
 }
 
 type pathReq struct {

diff --git a/root/proxiedauthenticationwebservice/proxiedauthenticationwebservice.go b/root/proxiedauthenticationwebservice/proxiedauthenticationwebservice.go
@@ -31,6 +31,7 @@ func New(logger levels.Levels, registryDriver root.RegistryDriver) (root.WebServ
 func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error) {
 	p, ok := s.cache.Get("proxy")
 	if ok {
+		s.logger.Info().Log("msg", "chosen proxy from cache")
 		return p.(*httputil.ReverseProxy), nil
 	}
 
@@ -54,7 +55,7 @@ func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error)
 		return nil, err
 	}
 	proxy := httputil.NewSingleHostReverseProxy(u)
-	s.cache.Set("proxy", proxy, cache.NoExpiration)
+	s.cache.Set("proxy", proxy, cache.DefaultExpiration)
 	return proxy, nil
 }
 

diff --git a/root/proxieddatawebservice/proxieddatawebservice.go b/root/proxieddatawebservice/proxieddatawebservice.go
@@ -31,6 +31,7 @@ func New(logger levels.Levels, registryDriver root.RegistryDriver) (root.WebServ
 func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error) {
 	p, ok := s.cache.Get("proxy")
 	if ok {
+		s.logger.Info().Log("msg", "chosen proxy from cache")
 		return p.(*httputil.ReverseProxy), nil
 	}
 
@@ -54,7 +55,7 @@ func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error)
 		return nil, err
 	}
 	proxy := httputil.NewSingleHostReverseProxy(u)
-	s.cache.Set("proxy", proxy, cache.NoExpiration)
+	s.cache.Set("proxy", proxy, cache.DefaultExpiration)
 	return proxy, nil
 }
 

diff --git a/root/proxiedmetadatawebservice/proxiedmetadatawebservice.go b/root/proxiedmetadatawebservice/proxiedmetadatawebservice.go
@@ -31,6 +31,7 @@ func New(logger levels.Levels, registryDriver root.RegistryDriver) (root.WebServ
 func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error) {
 	p, ok := s.cache.Get("proxy")
 	if ok {
+		s.logger.Info().Log("msg", "chosen proxy from cache")
 		return p.(*httputil.ReverseProxy), nil
 	}
 
@@ -54,7 +55,7 @@ func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error)
 		return nil, err
 	}
 	proxy := httputil.NewSingleHostReverseProxy(u)
-	s.cache.Set("proxy", proxy, cache.NoExpiration)
+	s.cache.Set("proxy", proxy, cache.DefaultExpiration)
 	return proxy, nil
 }
 

diff --git a/root/proxiedocwebservice/proxiedocwebservice.go b/root/proxiedocwebservice/proxiedocwebservice.go
@@ -31,6 +31,7 @@ func New(logger levels.Levels, registryDriver root.RegistryDriver) (root.WebServ
 func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error) {
 	p, ok := s.cache.Get("proxy")
 	if ok {
+		s.logger.Info().Log("msg", "chosen proxy from cache")
 		return p.(*httputil.ReverseProxy), nil
 	}
 
@@ -54,7 +55,7 @@ func (s *service) getProxy(ctx context.Context) (*httputil.ReverseProxy, error)
 		return nil, err
 	}
 	proxy := httputil.NewSingleHostReverseProxy(u)
-	s.cache.Set("proxy", proxy, cache.NoExpiration)
+	s.cache.Set("proxy", proxy, cache.DefaultExpiration)
 	return proxy, nil
 }