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

removes error2 logger

Browse Source
This commit is contained in:
bergquist 2019-01-15 11:49:18 +01:00
parent 1c0a385df1
commit 1b6203e430
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import (
"regexp" "regexp"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )
@ -21,6 +20,10 @@ func (NopImageUploader) Upload(ctx context.Context, path string) (string, error)
return "", nil return "", nil
} }
var (
logger = log.New("imguploader")
)
func NewImageUploader() (ImageUploader, error) { func NewImageUploader() (ImageUploader, error) {
switch setting.ImageUploadProvider { switch setting.ImageUploadProvider {
@ -94,7 +97,7 @@ func NewImageUploader() (ImageUploader, error) {
} }
if setting.ImageUploadProvider != "" { if setting.ImageUploadProvider != "" {
log.Error2("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider) logger.Error("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider)
} }
return NopImageUploader{}, nil return NopImageUploader{}, nil

14
pkg/log/log.go
View File

@ -10,13 +10,11 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"gopkg.in/ini.v1"
"github.com/go-stack/stack" "github.com/go-stack/stack"
"github.com/grafana/grafana/pkg/util"
"github.com/inconshreveable/log15" "github.com/inconshreveable/log15"
isatty "github.com/mattn/go-isatty" isatty "github.com/mattn/go-isatty"
"gopkg.in/ini.v1"
"github.com/grafana/grafana/pkg/util"
) )
var Root log15.Logger var Root log15.Logger
@ -88,18 +86,10 @@ func Warn(format string, v ...interface{}) {
Root.Warn(message) Root.Warn(message)
} }
func Warn2(message string, v ...interface{}) {
Root.Warn(message, v...)
}
func Error(skip int, format string, v ...interface{}) { func Error(skip int, format string, v ...interface{}) {
Root.Error(fmt.Sprintf(format, v...)) Root.Error(fmt.Sprintf(format, v...))
} }
func Error2(message string, v ...interface{}) {
Root.Error(message, v...)
}
func Critical(skip int, format string, v ...interface{}) { func Critical(skip int, format string, v ...interface{}) {
Root.Crit(fmt.Sprintf(format, v...)) Root.Crit(fmt.Sprintf(format, v...))
} }

2
pkg/services/alerting/notifiers/telegram.go
View File

@ -130,7 +130,7 @@ func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.Eval
defer func() { defer func() {
err := imageFile.Close() err := imageFile.Close()
if err != nil { if err != nil {
log.Error2("Could not close Telegram inline image.", "err", err) this.log.Error("Could not close Telegram inline image.", "err", err)
} }
}() }()

7
pkg/services/alerting/test_notification.go
View File

@ -18,9 +18,12 @@ type NotificationTestCommand struct {
Settings *simplejson.Json Settings *simplejson.Json
} }
var (
logger = log.New("alerting.testnotification")
)
func init() { func init() {
bus.AddHandler("alerting", handleNotificationTestCommand) bus.AddHandler("alerting", handleNotificationTestCommand)
} }
func handleNotificationTestCommand(cmd *NotificationTestCommand) error { func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
@ -35,7 +38,7 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
notifiers, err := InitNotifier(model) notifiers, err := InitNotifier(model)
if err != nil { if err != nil {
log.Error2("Failed to create notifier", "error", err.Error()) logger.Error("Failed to create notifier", "error", err.Error())
return err return err
} }