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

imguploader: log if the configuration is invalid

Browse Source
This commit is contained in:
bergquist
2017-12-28 15:48:02 +01:00
parent 212bb2a385
commit b840514797
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/components/imguploader/imguploader.go
View File

@@ -3,6 +3,7 @@ package imguploader
import (
"context"
"fmt"
"github.com/grafana/grafana/pkg/log"
"regexp"
"github.com/grafana/grafana/pkg/setting"
@@ -89,6 +90,10 @@ func NewImageUploader() (ImageUploader, error) {
return NewAzureBlobUploader(account_name, account_key, container_name), nil
}
if setting.ImageUploadProvider != "" {
log.Error2("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider)
}
return NopImageUploader{}, nil
}

2
pkg/setting/setting.go
View File

@@ -610,7 +610,7 @@ func NewConfigContext(args *CommandLineArgs) error {
}
imageUploadingSection := Cfg.Section("external_image_storage")
ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")
ImageUploadProvider = imageUploadingSection.Key("provider").MustString("")
return nil
}