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

Chore: Revert dskit service additions (#72608)

Browse Source
This commit is contained in:
Todd Treece
2023-08-03 09:19:01 -04:00
committed by GitHub
parent f6e836302b
commit f3ffc850aa
27 changed files with 313 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/setting/setting.go
View File

@@ -966,7 +966,7 @@ var skipStaticRootValidation = false
func NewCfg() *Cfg {
return &Cfg{
Target: []string{"all"},
Target: []string{},
Logger: log.New("settings"),
Raw: ini.Empty(),
Azure: &azsettings.AzureSettings{},
@@ -1025,8 +1025,10 @@ func (cfg *Cfg) Load(args CommandLineArgs) error {
cfg.ErrTemplateName = "error"
Target := valueAsString(iniFile.Section(""), "target", "all")
cfg.Target = strings.Split(Target, " ")
Target := valueAsString(iniFile.Section(""), "target", "")
if Target != "" {
cfg.Target = strings.Split(Target, " ")
}
Env = valueAsString(iniFile.Section(""), "app_mode", "development")
cfg.Env = Env
cfg.ForceMigration = iniFile.Section("").Key("force_migration").MustBool(false)