Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
b8405147
Commit
b8405147
authored
Dec 28, 2017
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imguploader: log if the configuration is invalid
parent
212bb2a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
pkg/components/imguploader/imguploader.go
+5
-0
pkg/setting/setting.go
+1
-1
No files found.
pkg/components/imguploader/imguploader.go
View file @
b8405147
...
...
@@ -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
}
...
...
pkg/setting/setting.go
View file @
b8405147
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment