From d9fa46e0a26d76531af930946f0637b67c36bf45 Mon Sep 17 00:00:00 2001 From: Nikhil Ranjan Date: Fri, 13 Sep 2019 03:02:14 +0200 Subject: [PATCH] =?UTF-8?q?Converting=20to=20structured=20logging=20the=20?= =?UTF-8?q?file=20store/sqlstore/post=5F=E2=80=A6=20(#12087)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/de.json | 4 ---- i18n/en.json | 4 ---- i18n/es.json | 4 ---- i18n/fr.json | 4 ---- i18n/it.json | 4 ---- i18n/ja.json | 4 ---- i18n/ko.json | 4 ---- i18n/nl.json | 4 ---- i18n/pl.json | 4 ---- i18n/pt-BR.json | 4 ---- i18n/ro.json | 4 ---- i18n/ru.json | 4 ---- i18n/tr.json | 4 ---- i18n/uk.json | 4 ---- i18n/zh-CN.json | 4 ---- i18n/zh-TW.json | 4 ---- mlog/log.go | 1 + store/sqlstore/post_store.go | 16 ++++++++-------- 18 files changed, 9 insertions(+), 72 deletions(-) diff --git a/i18n/de.json b/i18n/de.json index 92f71b20b9..9d97065f9b 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Konnte die zu löschenden Nachrichten für den Benutzer nicht auswählen (zu viele), bitte wiederholen." }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Konnte die maximal unterstützte Nachrichtengröße nicht bestimmen." - }, { "id": "store.sql_post.save.app_error", "translation": "Konnte die Nachricht nicht speichern." diff --git a/i18n/en.json b/i18n/en.json index 7a417a6d99..c2f3ffb85d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6354,10 +6354,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Unable to select the posts to delete for the user (too many), please re-run" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Unable to determine the maximum supported post size" - }, { "id": "store.sql_post.save.app_error", "translation": "Unable to save the Post" diff --git a/i18n/es.json b/i18n/es.json index 6767e50c31..81fccfe0b0 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "No se puede seleccionar los mensajes a eliminar del usuario (son demasiados), por favor ejecuta de nuevo" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "No se puede determinar el tamaño máximo soportado de los mensajes" - }, { "id": "store.sql_post.save.app_error", "translation": "No se puede guardar el mensaje" diff --git a/i18n/fr.json b/i18n/fr.json index 6ca1c1d245..44c6b20707 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Impossible de sélectionner les messages à supprimer pour l'utilisateur (ils sont trop nombreux), veuillez relancer l'opération" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Impossible de déterminer la taille maximale supportée pour les messages" - }, { "id": "store.sql_post.save.app_error", "translation": "Impossible de sauvegarder le message" diff --git a/i18n/it.json b/i18n/it.json index 80d8873cd3..fba3ccaf19 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Non è stato possibile selezionare le pubblicazioni da eliminare per l'utente (troppe pubblicazioni), per favore rilancia" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Impossibile determinare la dimensione massima supportata per le pubblicazioni" - }, { "id": "store.sql_post.save.app_error", "translation": "Impossibile salvare la pubblicazione" diff --git a/i18n/ja.json b/i18n/ja.json index b67c5fb611..80de9a5133 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "ユーザーの削除すべき投稿を選択できませんでした(数が多過ぎます)。再度実行してください" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "投稿サイズの最大値を定義できませんでした" - }, { "id": "store.sql_post.save.app_error", "translation": "投稿を保存できませんでした" diff --git a/i18n/ko.json b/i18n/ko.json index daffe64dde..c52bb4dbcd 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "We couldn't select the posts to delete for the user (too many), please re-run" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Unable to determine the maximum supported post size" - }, { "id": "store.sql_post.save.app_error", "translation": "내용을 가져올수 없습니다." diff --git a/i18n/nl.json b/i18n/nl.json index 8ff6c9e55e..92886986a7 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "We kunnen de geselecteerde berichten voor de gebruiker niet verwijderen (het zijn er te veel), probeer opnieuw" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Unable to determine the maximum supported post size" - }, { "id": "store.sql_post.save.app_error", "translation": "Bericht kan niet opgehaald worden" diff --git a/i18n/pl.json b/i18n/pl.json index c63b4b4157..b1520e1f0c 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Nie można wybrać postów do usunięcia dla użytkownika (zbyt wielu), uruchom ponownie" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Nie można określić maksymalnego obsługiwanego rozmiaru postu" - }, { "id": "store.sql_post.save.app_error", "translation": "Nie można zapisać wpisu" diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json index e283bce960..cf6aa5c695 100644 --- a/i18n/pt-BR.json +++ b/i18n/pt-BR.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Não foi possível selecionar as publicações para excluir do usuário (muitos), por favor, re-executar" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Não foi possível determinar o tamanho máximo de publicação suportado" - }, { "id": "store.sql_post.save.app_error", "translation": "Não foi possível salvar a Publicação" diff --git a/i18n/ro.json b/i18n/ro.json index 460880b33a..0c923af58e 100644 --- a/i18n/ro.json +++ b/i18n/ro.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Am putut selectaţi mesaje pentru a şterge pentru utilizator (prea multe), vă rugăm să re-rula" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Noi nu a putut determina dimensiunea maximă suportate de post" - }, { "id": "store.sql_post.save.app_error", "translation": "Imposibil de salvat postarea" diff --git a/i18n/ru.json b/i18n/ru.json index 493e148ef4..22e4303529 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Не удалось выбрать для удаления посты пользователя (слишком много), пожалуйста, запустите повторно" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Unable to determine the maximum supported post size" - }, { "id": "store.sql_post.save.app_error", "translation": "Не удалось удалить плагин" diff --git a/i18n/tr.json b/i18n/tr.json index 30907928c3..40615d161f 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Kullanıcının silinecek iletileri seçilemedi (çok fazla), lütfen yeniden çalıştırın" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Desteklenen en büyük ileti boyutu belirlenemedi" - }, { "id": "store.sql_post.save.app_error", "translation": "İleti kaydedilemedi" diff --git a/i18n/uk.json b/i18n/uk.json index 5404fccfba..17ff5ea81d 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "Не вдається вибрати повідомлення, які потрібно видалити для користувача (забагато), будь ласка, повторно запустіть" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "Ми не змогли визначити максимально підтримуваний розмір повідомлення" - }, { "id": "store.sql_post.save.app_error", "translation": "Не вдається зберегти публікацію" diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index 0c7c75fe39..2bbd5a6e20 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "无法删除该用户被选择的信息(数量太多)，请重新运行" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "无法判断最大支持的消息大小" - }, { "id": "store.sql_post.save.app_error", "translation": "无法保存消息" diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json index 7471573f02..08f5b4235e 100644 --- a/i18n/zh-TW.json +++ b/i18n/zh-TW.json @@ -6022,10 +6022,6 @@ "id": "store.sql_post.permanent_delete_by_user.too_many.app_error", "translation": "無法選擇該使用者的訊息以刪除 (數量太多)，請重新執行" }, - { - "id": "store.sql_post.query_max_post_size.error", - "translation": "無法判定最大支援的訊息大小" - }, { "id": "store.sql_post.save.app_error", "translation": "無法儲存訊息" diff --git a/mlog/log.go b/mlog/log.go index 503b140ed6..07d35a32da 100644 --- a/mlog/log.go +++ b/mlog/log.go @@ -28,6 +28,7 @@ const ( type Field = zapcore.Field var Int64 = zap.Int64 +var Int32 = zap.Int32 var Int = zap.Int var Uint32 = zap.Uint32 var String = zap.String diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 521f64ce9e..fa994a1aaa 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -115,18 +115,18 @@ func (s *SqlPostStore) Save(post *model.Post) (*model.Post, *model.AppError) { post.Type != model.POST_ADD_TO_CHANNEL && post.Type != model.POST_REMOVE_FROM_CHANNEL && post.Type != model.POST_ADD_TO_TEAM && post.Type != model.POST_REMOVE_FROM_TEAM { if _, err := s.GetMaster().Exec("UPDATE Channels SET LastPostAt = GREATEST(:LastPostAt, LastPostAt), TotalMsgCount = TotalMsgCount + 1 WHERE Id = :ChannelId", map[string]interface{}{"LastPostAt": time, "ChannelId": post.ChannelId}); err != nil { - mlog.Error(fmt.Sprintf("Error updating Channel LastPostAt: %v", err.Error())) + mlog.Error("Error updating Channel LastPostAt.", mlog.Err(err)) } } else { // don't update TotalMsgCount for unimportant messages so that the channel isn't marked as unread if _, err := s.GetMaster().Exec("UPDATE Channels SET LastPostAt = :LastPostAt WHERE Id = :ChannelId AND LastPostAt < :LastPostAt", map[string]interface{}{"LastPostAt": time, "ChannelId": post.ChannelId}); err != nil { - mlog.Error(fmt.Sprintf("Error updating Channel LastPostAt: %v", err.Error())) + mlog.Error("Error updating Channel LastPostAt.", mlog.Err(err)) } } if len(post.RootId) > 0 { if _, err := s.GetMaster().Exec("UPDATE Posts SET UpdateAt = :UpdateAt WHERE Id = :RootId", map[string]interface{}{"UpdateAt": time, "RootId": post.RootId}); err != nil { - mlog.Error(fmt.Sprintf("Error updating Post UpdateAt: %v", err.Error())) + mlog.Error("Error updating Post UpdateAt.", mlog.Err(err)) } } @@ -1043,7 +1043,7 @@ func (s *SqlPostStore) Search(teamId string, userId string, params *model.Search _, err := s.GetSearchReplica().Select(&posts, searchQuery, queryParams) if err != nil { - mlog.Warn(fmt.Sprintf("Query error searching posts: %v", err.Error())) + mlog.Warn("Query error searching posts.", mlog.Err(err)) // Don't return the error to the caller as it is of no use to the user. Instead return an empty set of search results. } else { for _, p := range posts { @@ -1232,7 +1232,7 @@ func (s *SqlPostStore) GetPostsByIds(postIds []string) ([]*model.Post, *model.Ap _, err := s.GetReplica().Select(&posts, query, params) if err != nil { - mlog.Error(fmt.Sprint(err)) + mlog.Error("Query error getting posts.", mlog.Err(err)) return nil, model.NewAppError("SqlPostStore.GetPostsByIds", "store.sql_post.get_posts_by_ids.app_error", nil, "", http.StatusInternalServerError) } return posts, nil @@ -1321,7 +1321,7 @@ func (s *SqlPostStore) determineMaxPostSize() int { table_name = 'posts' AND column_name = 'message' `); err != nil { - mlog.Error(utils.T("store.sql_post.query_max_post_size.error") + err.Error()) + mlog.Error("Unable to determine the maximum supported post size", mlog.Err(err)) } } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL { // The Post.Message column in MySQL has historically been TEXT, with a maximum @@ -1337,7 +1337,7 @@ func (s *SqlPostStore) determineMaxPostSize() int { AND column_name = 'Message' LIMIT 0, 1 `); err != nil { - mlog.Error(utils.T("store.sql_post.query_max_post_size.error") + err.Error()) + mlog.Error("Unable to determine the maximum supported post size", mlog.Err(err)) } } else { mlog.Warn("No implementation found to determine the maximum supported post size") @@ -1353,7 +1353,7 @@ func (s *SqlPostStore) determineMaxPostSize() int { maxPostSize = model.POST_MESSAGE_MAX_RUNES_V1 } - mlog.Info(fmt.Sprintf("Post.Message supports at most %d characters (%d bytes)", maxPostSize, maxPostSizeBytes)) + mlog.Info("Post.Message has size restrictions", mlog.Int("max_characters", maxPostSize), mlog.Int32("max_bytes", maxPostSizeBytes)) return maxPostSize }