From 29a9c41b708c9f8cd6ebc3211b6e2da44655ce4e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 18 Jun 2019 16:10:07 +0800 Subject: [PATCH 1/4] remove settting dependency on modules/session --- modules/session/virtual.go | 4 ---- modules/setting/cache.go | 3 +++ modules/setting/session.go | 2 -- modules/setting/setting.go | 8 -------- routers/routes/routes.go | 2 ++ 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/modules/session/virtual.go b/modules/session/virtual.go index b8ddd2f71bdd1..ac3c114fe5573 100644 --- a/modules/session/virtual.go +++ b/modules/session/virtual.go @@ -101,10 +101,6 @@ func (o *VirtualSessionProvider) GC() { o.provider.GC() } -func init() { - session.Register("VirtualSession", &VirtualSessionProvider{}) -} - // VirtualStore represents a virtual session store implementation. type VirtualStore struct { p *VirtualSessionProvider diff --git a/modules/setting/cache.go b/modules/setting/cache.go index babb62baeae14..1f79404e0044d 100644 --- 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 313c3c76b5a47..a741eeafe4db9 100644 --- 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 43a61aa7faeed..72de69771ba0b 100644 --- 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 744088a9d7b1e..060684e70f585 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -25,6 +25,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/validation" + session_service "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/admin" apiv1 "code.gitea.io/gitea/routers/api/v1" @@ -196,6 +197,7 @@ func NewMacaron() *macaron.Macaron { m.Use(captcha.Captchaer(captcha.Options{ SubURL: setting.AppSubURL, })) + session.Register("VirtualSession", &session_service.VirtualSessionProvider{}) m.Use(session.Sessioner(setting.SessionConfig)) m.Use(csrf.Csrfer(csrf.Options{ Secret: setting.SecretKey, From 3fb90c12cd8778cf1f922ad0a8f7fe8226d4d7d1 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 19 Jun 2019 09:37:25 +0800 Subject: [PATCH 2/4] fix fmt --- routers/routes/routes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 060684e70f585..a5043f30dd729 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -22,10 +22,10 @@ import ( "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/public" + session_service "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/validation" - session_service "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/admin" apiv1 "code.gitea.io/gitea/routers/api/v1" From e6a0faa2a1a3615524d458cb0af67144db568383 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 19 Jun 2019 15:15:53 +0800 Subject: [PATCH 3/4] fix tests --- modules/session/virtual.go | 4 ++++ routers/routes/routes.go | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/session/virtual.go b/modules/session/virtual.go index ac3c114fe5573..b8ddd2f71bdd1 100644 --- a/modules/session/virtual.go +++ b/modules/session/virtual.go @@ -101,6 +101,10 @@ func (o *VirtualSessionProvider) GC() { o.provider.GC() } +func init() { + session.Register("VirtualSession", &VirtualSessionProvider{}) +} + // VirtualStore represents a virtual session store implementation. type VirtualStore struct { p *VirtualSessionProvider diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a5043f30dd729..6a770f94c1450 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -22,7 +22,7 @@ import ( "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/public" - session_service "code.gitea.io/gitea/modules/session" + _ "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/validation" @@ -197,7 +197,6 @@ func NewMacaron() *macaron.Macaron { m.Use(captcha.Captchaer(captcha.Options{ SubURL: setting.AppSubURL, })) - session.Register("VirtualSession", &session_service.VirtualSessionProvider{}) m.Use(session.Sessioner(setting.SessionConfig)) m.Use(csrf.Csrfer(csrf.Options{ Secret: setting.SecretKey, From 7c1d897a508b3c67e2e363c44b4bc33eddadd407 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 20 Jun 2019 17:35:00 +0800 Subject: [PATCH 4/4] fix lint --- routers/routes/routes.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 6a770f94c1450..e74d65e2302d3 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -22,7 +22,6 @@ import ( "code.gitea.io/gitea/modules/metrics" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/public" - _ "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/validation" @@ -36,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"