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/entry.go | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 internal/log/entry.go (limited to 'internal/log/entry.go') diff --git a/internal/log/entry.go b/internal/log/entry.go new file mode 100644 index 000000000..2e6f62e96 --- /dev/null +++ b/internal/log/entry.go @@ -0,0 +1,117 @@ +/* + 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 ( + "fmt" + "syscall" + + "codeberg.org/gruf/go-kv" + "codeberg.org/gruf/go-logger/v2/level" +) + +type Entry struct { + fields []kv.Field +} + +func (e Entry) WithField(key string, value interface{}) Entry { + e.fields = append(e.fields, kv.Field{K: key, V: value}) + return e +} + +func (e Entry) WithFields(fields ...kv.Field) Entry { + e.fields = append(e.fields, fields...) + return e +} + +func (e Entry) Trace(a ...interface{}) { + logf(level.TRACE, e.fields, args(len(a)), a...) +} + +func (e Entry) Tracef(s string, a ...interface{}) { + logf(level.TRACE, e.fields, s, a...) +} + +func (e Entry) Debug(a ...interface{}) { + logf(level.DEBUG, e.fields, args(len(a)), a...) +} + +func (e Entry) Debugf(s string, a ...interface{}) { + logf(level.DEBUG, e.fields, s, a...) +} + +func (e Entry) Info(a ...interface{}) { + logf(level.INFO, e.fields, args(len(a)), a...) +} + +func (e Entry) Infof(s string, a ...interface{}) { + logf(level.INFO, e.fields, s, a...) +} + +func (e Entry) Warn(a ...interface{}) { + logf(level.WARN, e.fields, args(len(a)), a...) +} + +func (e Entry) Warnf(s string, a ...interface{}) { + logf(level.WARN, e.fields, s, a...) +} + +func (e Entry) Error(a ...interface{}) { + logf(level.ERROR, e.fields, args(len(a)), a...) +} + +func (e Entry) Errorf(s string, a ...interface{}) { + logf(level.ERROR, e.fields, s, a...) +} + +func (e Entry) Fatal(a ...interface{}) { + defer syscall.Exit(1) + logf(level.FATAL, e.fields, args(len(a)), a...) +} + +func (e Entry) Fatalf(s string, a ...interface{}) { + defer syscall.Exit(1) + logf(level.FATAL, e.fields, s, a...) +} + +func (e Entry) Panic(a ...interface{}) { + defer panic(fmt.Sprint(a...)) + logf(level.PANIC, e.fields, args(len(a)), a...) +} + +func (e Entry) Panicf(s string, a ...interface{}) { + defer panic(fmt.Sprintf(s, a...)) + logf(level.PANIC, e.fields, s, a...) +} + +func (e Entry) Log(lvl level.LEVEL, a ...interface{}) { + logf(lvl, e.fields, args(len(a)), a...) +} + +func (e Entry) Logf(lvl level.LEVEL, s string, a ...interface{}) { + logf(lvl, e.fields, s, a...) +} + +func (e Entry) Print(a ...interface{}) { + printf(e.fields, args(len(a)), a...) +} + +func (e Entry) Printf(s string, a ...interface{}) { + printf(e.fields, s, a...) +} -- cgit v1.2.3