mirror of
https://github.com/foxcpp/maddy.git
synced 2025-04-05 14:07:38 +03:00
bf188e454f
The intention is to keep to repo root clean while the list of packages is slowly growing. Additionally, a bunch of small (~30 LoC) files in the repo root is merged into a single maddy.go file, for the same reason. Most of the internal code is moved into the internal/ directory. Go toolchain will make it impossible to import these packages from external applications. Some packages are renamed and moved into the pkg/ directory in the root. According to https://github.com/golang-standards/project-layout this is the de-facto standard to place "library code that's ok to use by external applications" in. To clearly define the purpose of top-level directories, README.md files are added to each.
62 lines
1.3 KiB
Go
62 lines
1.3 KiB
Go
package log
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// To support ad-hoc parsing in a better way we want to make order of fields in
|
|
// output JSON documents determistics. Additionally, this will make them more
|
|
// human-readable when values from multiple messages are lined up to each
|
|
// other.
|
|
|
|
func marshalOrderedJSON(output *strings.Builder, m map[string]interface{}) error {
|
|
// TODO: Consider making maps used for error tracing and logging ordered in
|
|
// the first place to avoid sorting overhead.
|
|
order := make([]string, 0, len(m))
|
|
for k := range m {
|
|
order = append(order, k)
|
|
}
|
|
sort.Strings(order)
|
|
|
|
output.WriteRune('{')
|
|
for i, key := range order {
|
|
if i != 0 {
|
|
output.WriteRune(',')
|
|
}
|
|
|
|
jsonKey, err := json.Marshal(key)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
output.Write(jsonKey)
|
|
output.WriteString(":")
|
|
|
|
val := m[key]
|
|
switch casted := val.(type) {
|
|
case time.Time:
|
|
val = casted.Format("2006-01-02T15:04:05.000")
|
|
case time.Duration:
|
|
val = casted.String()
|
|
case LogFormatter:
|
|
val = casted.FormatLog()
|
|
case fmt.Stringer:
|
|
val = casted.String()
|
|
case error:
|
|
val = casted.Error()
|
|
}
|
|
|
|
jsonValue, err := json.Marshal(val)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
output.Write(jsonValue)
|
|
}
|
|
output.WriteRune('}')
|
|
|
|
return nil
|
|
}
|