summaryrefslogtreecommitdiffstats
path: root/app/emoji.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-04-27 12:49:45 -0700
committerGitHub <noreply@github.com>2018-04-27 12:49:45 -0700
commit686c2fbab7607d42183ae685a27ea3d7dce8c3f6 (patch)
tree53ed73cada57bc43f342ac10e2f842cddb095218 /app/emoji.go
parent2acbc77d78456d7ba76ceb687b18985d7d92f814 (diff)
downloadchat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.gz
chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.bz2
chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.zip
Structured logging (#8673)
* Implementing structured logging * Changes to en.json to allow refactor to run. * Fixing global logger * Structured logger initalization. * Add caller. * Do some log redirection. * Auto refactor * Cleaning up l4g reference and removing dependancy. * Removing junk. * Copyright headers. * Fixing tests * Revert "Changes to en.json to allow refactor to run." This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026. * Fixing some auto refactor strangeness and typo. * Making keys more human readable.
Diffstat (limited to 'app/emoji.go')
-rw-r--r--app/emoji.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/emoji.go b/app/emoji.go
index eebe59ccf..f48501cf9 100644
--- a/app/emoji.go
+++ b/app/emoji.go
@@ -5,6 +5,7 @@ package app
import (
"bytes"
+ "fmt"
"image"
"image/draw"
"image/gif"
@@ -14,13 +15,11 @@ import (
"mime/multipart"
"net/http"
- l4g "github.com/alecthomas/log4go"
-
"image/color/palette"
"github.com/disintegration/imaging"
+ "github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
- "github.com/mattermost/mattermost-server/utils"
)
const (
@@ -242,13 +241,13 @@ func imageToPaletted(img image.Image) *image.Paletted {
func (a *App) deleteEmojiImage(id string) {
if err := a.MoveFile(getEmojiImagePath(id), "emoji/"+id+"/image_deleted"); err != nil {
- l4g.Error("Failed to rename image when deleting emoji %v", id)
+ mlog.Error(fmt.Sprintf("Failed to rename image when deleting emoji %v", id))
}
}
func (a *App) deleteReactionsForEmoji(emojiName string) {
if result := <-a.Srv.Store.Reaction().DeleteAllWithEmojiName(emojiName); result.Err != nil {
- l4g.Warn(utils.T("api.emoji.delete.delete_reactions.app_error"), emojiName)
- l4g.Warn(result.Err)
+ mlog.Warn(fmt.Sprintf("Unable to delete reactions when deleting emoji with emoji name %v", emojiName))
+ mlog.Warn(fmt.Sprint(result.Err))
}
}