From b00a49eaf7aac018629ab51e9db7a30ef486a837 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Wed, 30 May 2018 13:58:55 -0500
Subject: [PATCH] lint: confusing mix between var names and same packages

---
 app/main.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/main.go b/app/main.go
index a02a50e1..e9556293 100644
--- a/app/main.go
+++ b/app/main.go
@@ -114,7 +114,7 @@ func New(opts Opts) (*Application, error) {
 		MaxCommentSize: opts.MaxCommentSize,
 	}
 
-	cache := cache.NewLoadingCache(cache.MaxValSize(opts.MaxCachedValue), cache.MaxKeys(opts.MaxCachedItems),
+	loadingCache := cache.NewLoadingCache(cache.MaxValSize(opts.MaxCachedValue), cache.MaxKeys(opts.MaxCachedItems),
 		cache.PostFlushFn(postFlushFn(opts.Sites, opts.Port)))
 
 	jwtService := auth.NewJWT(opts.SecretKey, strings.HasPrefix(opts.RemarkURL, "https://"), 7*24*time.Hour)
@@ -127,9 +127,9 @@ func New(opts Opts) (*Application, error) {
 
 	exporter := &migrator.Remark{DataStore: &dataService}
 
-	migrator := &api.Migrator{
+	migr := &api.Migrator{
 		Version:        revision,
-		Cache:          cache,
+		Cache:          loadingCache,
 		NativeImporter: &migrator.Remark{DataStore: &dataService},
 		DisqusImporter: &migrator.Disqus{DataStore: &dataService},
 		NativeExported: &migrator.Remark{DataStore: &dataService},
@@ -150,11 +150,11 @@ func New(opts Opts) (*Application, error) {
 			Providers:  makeAuthProviders(jwtService, avatarProxy, dataService, opts),
 			DevPasswd:  opts.DevPasswd,
 		},
-		Cache: cache,
+		Cache: loadingCache,
 	}
 	srv.ScoreThresholds.Low, srv.ScoreThresholds.Critical = opts.LowScore, opts.CriticalScore
 	tch := make(chan struct{})
-	return &Application{srv: srv, migrator: migrator, exporter: exporter, Opts: opts, terminated: tch}, nil
+	return &Application{srv: srv, migrator: migr, exporter: exporter, Opts: opts, terminated: tch}, nil
 }
 
 // Run all application objects