imguploader: log if the configuration is invalid

pull/10383/head
bergquist 8 years ago
parent 212bb2a385
commit b840514797
  1. 5
      pkg/components/imguploader/imguploader.go
  2. 2
      pkg/setting/setting.go

@ -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
}

@ -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
}

Loading…
Cancel
Save