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

fix bad log format (#35150)

Browse Source
This commit is contained in:
Will Browne 2021-06-03 10:26:52 +02:00 committed by GitHub
parent 9df23b8fff
commit 057ba4a6e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/plugins/manager/manager.go
View File

@ -634,7 +634,7 @@ func (s *PluginScanner) validateSignature(plugin *plugins.PluginBase) *plugins.P
switch plugin.Signature { switch plugin.Signature {
case plugins.PluginSignatureUnsigned: case plugins.PluginSignatureUnsigned:
if allowed := s.allowUnsigned(plugin); !allowed { if allowed := s.allowUnsigned(plugin); !allowed {
s.log.Debug("Plugin is unsigned", "id", plugin.Id) s.log.Debug("Plugin is unsigned", "pluginID", plugin.Id)
s.errors = append(s.errors, fmt.Errorf("plugin '%s' is unsigned", plugin.Id)) s.errors = append(s.errors, fmt.Errorf("plugin '%s' is unsigned", plugin.Id))
return &plugins.PluginError{ return &plugins.PluginError{
ErrorCode: signatureMissing, ErrorCode: signatureMissing,
@ -644,13 +644,13 @@ func (s *PluginScanner) validateSignature(plugin *plugins.PluginBase) *plugins.P
plugin.PluginDir) plugin.PluginDir)
return nil return nil
case plugins.PluginSignatureInvalid: case plugins.PluginSignatureInvalid:
s.log.Debug("Plugin '%s' has an invalid signature", plugin.Id) s.log.Debug("Plugin has an invalid signature", "pluginID", plugin.Id)
s.errors = append(s.errors, fmt.Errorf("plugin '%s' has an invalid signature", plugin.Id)) s.errors = append(s.errors, fmt.Errorf("plugin '%s' has an invalid signature", plugin.Id))
return &plugins.PluginError{ return &plugins.PluginError{
ErrorCode: signatureInvalid, ErrorCode: signatureInvalid,
} }
case plugins.PluginSignatureModified: case plugins.PluginSignatureModified:
s.log.Debug("Plugin '%s' has a modified signature", plugin.Id) s.log.Debug("Plugin has a modified signature", "pluginID", plugin.Id)
s.errors = append(s.errors, fmt.Errorf("plugin '%s' has a modified signature", plugin.Id)) s.errors = append(s.errors, fmt.Errorf("plugin '%s' has a modified signature", plugin.Id))
return &plugins.PluginError{ return &plugins.PluginError{
ErrorCode: signatureModified, ErrorCode: signatureModified,