From 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 19 Jul 2022 09:47:55 +0100 Subject: [chore] use our own logging implementation (#716) * first commit Signed-off-by: kim * replace logging with our own log library Signed-off-by: kim * fix imports Signed-off-by: kim * fix log imports Signed-off-by: kim * add license text Signed-off-by: kim * fix package import cycle between config and log package Signed-off-by: kim * fix empty kv.Fields{} being passed to WithFields() Signed-off-by: kim * fix uses of log.WithFields() with whitespace issues and empty slices Signed-off-by: kim * *linter related grumbling* Signed-off-by: kim * gofmt the codebase! also fix more log.WithFields() formatting issues Signed-off-by: kim * update testrig code to match new changes Signed-off-by: kim * fix error wrapping in non fmt.Errorf function Signed-off-by: kim * add benchmarking of log.Caller() vs non-cached Signed-off-by: kim * fix syslog tests, add standard build tags to test runner to ensure consistency Signed-off-by: kim * make syslog tests more robust Signed-off-by: kim * fix caller depth arithmatic (is that how you spell it?) Signed-off-by: kim * update to use unkeyed fields in kv.Field{} instances Signed-off-by: kim * update go-kv library Signed-off-by: kim * update libraries list Signed-off-by: kim * fuck you linter get nerfed Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/log/trimhook.go | 53 ------------------------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 internal/log/trimhook.go (limited to 'internal/log/trimhook.go') diff --git a/internal/log/trimhook.go b/internal/log/trimhook.go deleted file mode 100644 index c9faccb90..000000000 --- a/internal/log/trimhook.go +++ /dev/null @@ -1,53 +0,0 @@ -/* - GoToSocial - Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -package log - -import ( - "github.com/sirupsen/logrus" -) - -// trimHook is a wrapper round a logrus hook that trims the *entry.Message -// to no more than 1700 characters before sending it through to the wrapped hook, -// to avoid spamming syslog with messages that are too long for it. -type trimHook struct { - wrappedHook logrus.Hook -} - -func (t *trimHook) Fire(e *logrus.Entry) error { - // only copy/truncate if we need to - if len(e.Message) < 1700 { - return t.wrappedHook.Fire(e) - } - - // it's too long, truncate + fire a copy of the entry so we don't meddle with the original - return t.wrappedHook.Fire(&logrus.Entry{ - Logger: e.Logger, - Data: e.Data, - Time: e.Time, - Level: e.Level, - Caller: e.Caller, - Message: e.Message[:1696] + "...", // truncate - Buffer: e.Buffer, - Context: e.Context, - }) -} - -func (t *trimHook) Levels() []logrus.Level { - return t.wrappedHook.Levels() -} -- cgit v1.2.3