Merge pull request #74 from rekby/devel

Fix test server flag Some improve log messages about cache miss
rekby · Jul 10, 2019 · 060fb91 · 060fb91
2 parents 0fabbe7 + d511cc9
commit 060fb91
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cmd/config.go b/cmd/config.go
@@ -79,7 +79,7 @@ func getConfig(ctx context.Context) *configType {
 func applyFlags(ctx context.Context, config *configType) {
 	if *testAcmeServerP {
 		zc.L(ctx).Info("Set test acme server by command line flag")
-		config.General.AcmeServer = "https://acme-staging-v02.api.letsencrypt.org/directory"
+		config.General.AcmeServer = "https://acme-staging.api.letsencrypt.org/directory"
 	}
 }
 

diff --git a/internal/cache/disk.go b/internal/cache/disk.go
@@ -26,12 +26,14 @@ func (c *DiskCache) Get(ctx context.Context, key string) ([]byte, error) {
 	c.mu.RLock()
 	defer c.mu.RUnlock()
 
-	res, err := ioutil.ReadFile(c.filepath(key))
+	filePath := c.filepath(key)
+	res, err := ioutil.ReadFile(filePath)
 	if os.IsNotExist(err) {
 		err = ErrCacheMiss
 	}
 
-	zc.L(ctx).Debug("Got from disk cache", zap.String("dir", c.Dir), zap.String("key", key), zap.Error(err))
+	zc.L(ctx).Debug("Got from disk cache", zap.String("dir", c.Dir), zap.String("key", key),
+		zap.String("file", filePath), zap.Error(err))
 	return res, err
 }
 

diff --git a/internal/cache/interface.go b/internal/cache/interface.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 )
 
-var ErrCacheMiss = errors.New("lets proxy: certificate cache miss")
+var ErrCacheMiss = errors.New("lets proxy: cache miss")
 
 type Cache interface {
 	// Get returns a certificate data for the specified key.