Remove settting dependency on modules/session (#7237)

* remove settting dependency on modules/session

* fix fmt

* fix tests

* fix lint

diff --git a/modules/setting/cache.go b/modules/setting/cache.go
index babb62baeae14c08600b3816093605451fdee170..1f79404e0044d9be2bfa5225b6149b94ba6e026f 100644 (file)
--- a/modules/setting/cache.go
+++ b/modules/setting/cache.go
@@ -9,6 +9,9 @@ import (
        "time"
 
        "code.gitea.io/gitea/modules/log"
+
+       _ "github.com/go-macaron/cache/memcache" // memcache plugin for cache
+       _ "github.com/go-macaron/cache/redis"
 )
 
 // Cache represents cache settings

diff --git a/modules/setting/session.go b/modules/setting/session.go
index 7009576ccb4ac1c81fc67bd4a323a72daca0abd7..bed3a9d8c077eeca2160292d3c6a8cb82e37b619 100644 (file)
--- a/modules/setting/session.go
+++ b/modules/setting/session.go
@@ -11,8 +11,6 @@ import (
        "strings"
 
        "code.gitea.io/gitea/modules/log"
-       // This ensures that VirtualSessionProvider is available
-       _ "code.gitea.io/gitea/modules/session"
 
        "github.com/go-macaron/session"
 )

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 6a5c5a36d706406c305d417534dfca4dfc4eac1e..97bdc03cc9a56ea49b10bde0ed67f73abc21e3bb 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -29,14 +29,6 @@ import (
 
        "github.com/Unknwon/cae/zip"
        "github.com/Unknwon/com"
-       _ "github.com/go-macaron/cache/memcache" // memcache plugin for cache
-       _ "github.com/go-macaron/cache/redis"
-       _ "github.com/go-macaron/session/couchbase" // couchbase plugin for session store
-       _ "github.com/go-macaron/session/memcache"  // memcache plugin for session store
-       _ "github.com/go-macaron/session/mysql"     // mysql plugin for session store
-       _ "github.com/go-macaron/session/nodb"      // nodb plugin for session store
-       _ "github.com/go-macaron/session/postgres"  // postgres plugin for session store
-       _ "github.com/go-macaron/session/redis"     // redis plugin for store session
        shellquote "github.com/kballard/go-shellquote"
        version "github.com/mcuadros/go-version"
        ini "gopkg.in/ini.v1"

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 196420dfe4bba3fef34704e41ebb3a67b0a5f9d3..6169aa563c099773033779032878b42cc85fe070 100644 (file)
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -35,6 +35,9 @@ import (
        "code.gitea.io/gitea/routers/user"
        userSetting "code.gitea.io/gitea/routers/user/setting"
 
+       // to registers all internal adapters
+       _ "code.gitea.io/gitea/modules/session"
+
        "github.com/go-macaron/binding"
        "github.com/go-macaron/cache"
        "github.com/go-macaron/captcha"