Settings: Remove global variable (#26613)

This commit is contained in:
Torkel Ödegaard
2020-07-26 23:36:36 -07:00
committed by GitHub
parent ae3c285312
commit 3defb4441e
2 changed files with 1 additions and 12 deletions
-10
View File
@@ -215,7 +215,6 @@ var (
S3TempImageStoreSecretKey string
ImageUploadProvider string
FeatureToggles map[string]bool
)
// TODO move all global vars to this struct
@@ -1023,7 +1022,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
for _, feature := range util.SplitString(featuresTogglesStr) {
cfg.FeatureToggles[feature] = true
}
FeatureToggles = cfg.FeatureToggles
// check old location for this option
if panelsSection.Key("enable_alpha").MustBool(false) {
@@ -1191,11 +1189,3 @@ func (s *DynamicSection) Key(k string) *ini.Key {
func (cfg *Cfg) SectionWithEnvOverrides(s string) *DynamicSection {
return &DynamicSection{cfg.Raw.Section(s), cfg.Logger}
}
func IsExpressionsEnabled() bool {
v, ok := FeatureToggles["expressions"]
if !ok {
return false
}
return v
}