mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[chore] use our own logging implementation (#716)
* first commit Signed-off-by: kim <grufwub@gmail.com> * replace logging with our own log library Signed-off-by: kim <grufwub@gmail.com> * fix imports Signed-off-by: kim <grufwub@gmail.com> * fix log imports Signed-off-by: kim <grufwub@gmail.com> * add license text Signed-off-by: kim <grufwub@gmail.com> * fix package import cycle between config and log package Signed-off-by: kim <grufwub@gmail.com> * fix empty kv.Fields{} being passed to WithFields() Signed-off-by: kim <grufwub@gmail.com> * fix uses of log.WithFields() with whitespace issues and empty slices Signed-off-by: kim <grufwub@gmail.com> * *linter related grumbling* Signed-off-by: kim <grufwub@gmail.com> * gofmt the codebase! also fix more log.WithFields() formatting issues Signed-off-by: kim <grufwub@gmail.com> * update testrig code to match new changes Signed-off-by: kim <grufwub@gmail.com> * fix error wrapping in non fmt.Errorf function Signed-off-by: kim <grufwub@gmail.com> * add benchmarking of log.Caller() vs non-cached Signed-off-by: kim <grufwub@gmail.com> * fix syslog tests, add standard build tags to test runner to ensure consistency Signed-off-by: kim <grufwub@gmail.com> * make syslog tests more robust Signed-off-by: kim <grufwub@gmail.com> * fix caller depth arithmatic (is that how you spell it?) Signed-off-by: kim <grufwub@gmail.com> * update to use unkeyed fields in kv.Field{} instances Signed-off-by: kim <grufwub@gmail.com> * update go-kv library Signed-off-by: kim <grufwub@gmail.com> * update libraries list Signed-off-by: kim <grufwub@gmail.com> * fuck you linter get nerfed Signed-off-by: kim <grufwub@gmail.com> Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
This commit is contained in:
71
vendor/codeberg.org/gruf/go-kv/util.go
generated
vendored
Normal file
71
vendor/codeberg.org/gruf/go-kv/util.go
generated
vendored
Normal file
@@ -0,0 +1,71 @@
|
||||
package kv
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"codeberg.org/gruf/go-byteutil"
|
||||
"codeberg.org/gruf/go-kv/format"
|
||||
)
|
||||
|
||||
// appendQuoteKey will append and escape/quote a formatted key string.
|
||||
func appendQuoteKey(buf *byteutil.Buffer, str string) {
|
||||
switch {
|
||||
case !strconv.CanBackquote(str):
|
||||
// Append quoted and escaped string
|
||||
buf.B = strconv.AppendQuote(buf.B, str)
|
||||
case format.ContainsDoubleQuote(str):
|
||||
// Double quote and escape string
|
||||
buf.B = append(buf.B, '"')
|
||||
buf.B = format.AppendEscape(buf.B, str)
|
||||
buf.B = append(buf.B, '"')
|
||||
case len(str) < 1 || format.ContainsSpaceOrTab(str):
|
||||
// Double quote this string as-is
|
||||
buf.WriteString(`"` + str + `"`)
|
||||
default:
|
||||
// Append string as-is
|
||||
buf.WriteString(str)
|
||||
}
|
||||
}
|
||||
|
||||
// appendQuoteValue will append and escape/quote a formatted value string.
|
||||
func appendQuoteValue(buf *byteutil.Buffer, str string) {
|
||||
switch {
|
||||
case !strconv.CanBackquote(str):
|
||||
// Append quoted and escaped string
|
||||
buf.B = strconv.AppendQuote(buf.B, str)
|
||||
return
|
||||
case !doubleQuoted(str):
|
||||
if format.ContainsDoubleQuote(str) {
|
||||
// Double quote and escape string
|
||||
buf.B = append(buf.B, '"')
|
||||
buf.B = format.AppendEscape(buf.B, str)
|
||||
buf.B = append(buf.B, '"')
|
||||
return
|
||||
} else if format.ContainsSpaceOrTab(str) {
|
||||
// Double quote this string as-is
|
||||
buf.WriteString(`"` + str + `"`)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Append string as-is
|
||||
buf.WriteString(str)
|
||||
}
|
||||
|
||||
// doubleQuoted will return whether 'str' is double quoted.
|
||||
func doubleQuoted(str string) bool {
|
||||
if len(str) < 2 ||
|
||||
str[0] != '"' || str[len(str)-1] != '"' {
|
||||
return false
|
||||
}
|
||||
var delim bool
|
||||
for i := len(str) - 2; i >= 0; i-- {
|
||||
switch str[i] {
|
||||
case '\\':
|
||||
delim = !delim
|
||||
default:
|
||||
return !delim
|
||||
}
|
||||
}
|
||||
return !delim
|
||||
}
|
Reference in New Issue
Block a user