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

renames distcache -> remotecache

Browse Source
This commit is contained in:
bergquist
2019-03-08 20:49:16 +01:00
parent 66e71b66dd
commit 7e7427637c
13 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/setting/setting.go
View File

@@ -242,7 +242,7 @@ type Cfg struct {
EditorsCanOwn bool
// DistributedCache
CacheOptions *CacheOpts
RemoteCacheOptions *RemoteCacheOptions
}
type CommandLineArgs struct {
@@ -782,8 +782,8 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
enterprise := iniFile.Section("enterprise")
cfg.EnterpriseLicensePath = enterprise.Key("license_path").MustString(filepath.Join(cfg.DataPath, "license.jwt"))
cacheServer := iniFile.Section("cache_server")
cfg.CacheOptions = &CacheOpts{
cacheServer := iniFile.Section("remote_cache")
cfg.RemoteCacheOptions = &RemoteCacheOptions{
Name: cacheServer.Key("type").MustString("database"),
ConnStr: cacheServer.Key("connstr").MustString(""),
}
@@ -791,7 +791,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
return nil
}
type CacheOpts struct {
type RemoteCacheOptions struct {
Name string
ConnStr string
}