IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3458 from improbable-io/use-memcache-for-session

Browse Source 
Add memcache as session provider
This commit is contained in:
Carl Bergquist
2015-12-17 15:56:15 +01:00
parent 24acea7261 b97b23647e
commit 333f9101a0
8 changed files with 998 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/middleware/session.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/Unknwon/macaron"
"github.com/macaron-contrib/session"
_ "github.com/macaron-contrib/session/memcache"
_ "github.com/macaron-contrib/session/mysql"
_ "github.com/macaron-contrib/session/postgres"
_ "github.com/macaron-contrib/session/redis"

2
pkg/setting/setting.go
View File

@@ -492,7 +492,7 @@ func NewConfigContext(args *CommandLineArgs) error {
func readSessionConfig() {
sec := Cfg.Section("session")
SessionOptions = session.Options{}
SessionOptions.Provider = sec.Key("provider").In("memory", []string{"memory", "file", "redis", "mysql", "postgres"})
SessionOptions.Provider = sec.Key("provider").In("memory", []string{"memory", "file", "redis", "mysql", "postgres", "memcache"})
SessionOptions.ProviderConfig = strings.Trim(sec.Key("provider_config").String(), "\" ")
SessionOptions.CookieName = sec.Key("cookie_name").MustString("grafana_sess")
SessionOptions.CookiePath = AppSubUrl