mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-27 13:48:49 +08:00

* Use normalizer as stream source Renamed 'writer' service to 'normalizer' and dropped Cassandra facilities from it. Extracted the common dependencies to 'mainflux' package for easier sharing. Fixed the API docs and unified environment variables. Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Use docker build arguments to specify build Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Remove cassandra libraries Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Update go-kit version to 0.6.0 Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Fix manager configuration Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Refactor docker-compose Merged individual compose files and dropped external links. Remove CoAP container since it is not referenced from NginX config at the moment. Update port mapping in compose and nginx.conf. Dropped bin scripts. Updated service documentation. Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Drop content-type check Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Implement users data access layer in PostgreSQL Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Bump version to 0.1.0 Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Use go-kit logger everywhere (except CoAP) Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Improve factory methods naming Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Implement clients data access layer on PostgreSQL Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Make tests stateless All tests are refactored to use map-based table-driven tests. No cross-tests dependencies is present anymore. Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Remove gitignore Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Fix nginx proxying Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Mark client-user FK explicit Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Update API documentation Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Update channel model Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Add channel PostgreSQL repository tests Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Implement PostgreSQL channels DAO Replaced update queries with raw SQL. Explicitly defined M2M table due to difficulties of ensuring the referential integrity through GORM. Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Expose connection endpoints Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Fix swagger docs and remove DB logging Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Fix nested query remarks Signed-off-by: Dejan Mijic <dejan@mainflux.com> * Add unique indices Signed-off-by: Dejan Mijic <dejan@mainflux.com>
90 lines
1.9 KiB
Go
90 lines
1.9 KiB
Go
package log
|
|
|
|
import (
|
|
"encoding"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"reflect"
|
|
)
|
|
|
|
type jsonLogger struct {
|
|
io.Writer
|
|
}
|
|
|
|
// NewJSONLogger returns a Logger that encodes keyvals to the Writer as a
|
|
// single JSON object. Each log event produces no more than one call to
|
|
// w.Write. The passed Writer must be safe for concurrent use by multiple
|
|
// goroutines if the returned Logger will be used concurrently.
|
|
func NewJSONLogger(w io.Writer) Logger {
|
|
return &jsonLogger{w}
|
|
}
|
|
|
|
func (l *jsonLogger) Log(keyvals ...interface{}) error {
|
|
n := (len(keyvals) + 1) / 2 // +1 to handle case when len is odd
|
|
m := make(map[string]interface{}, n)
|
|
for i := 0; i < len(keyvals); i += 2 {
|
|
k := keyvals[i]
|
|
var v interface{} = ErrMissingValue
|
|
if i+1 < len(keyvals) {
|
|
v = keyvals[i+1]
|
|
}
|
|
merge(m, k, v)
|
|
}
|
|
return json.NewEncoder(l.Writer).Encode(m)
|
|
}
|
|
|
|
func merge(dst map[string]interface{}, k, v interface{}) {
|
|
var key string
|
|
switch x := k.(type) {
|
|
case string:
|
|
key = x
|
|
case fmt.Stringer:
|
|
key = safeString(x)
|
|
default:
|
|
key = fmt.Sprint(x)
|
|
}
|
|
|
|
// We want json.Marshaler and encoding.TextMarshaller to take priority over
|
|
// err.Error() and v.String(). But json.Marshall (called later) does that by
|
|
// default so we force a no-op if it's one of those 2 case.
|
|
switch x := v.(type) {
|
|
case json.Marshaler:
|
|
case encoding.TextMarshaler:
|
|
case error:
|
|
v = safeError(x)
|
|
case fmt.Stringer:
|
|
v = safeString(x)
|
|
}
|
|
|
|
dst[key] = v
|
|
}
|
|
|
|
func safeString(str fmt.Stringer) (s string) {
|
|
defer func() {
|
|
if panicVal := recover(); panicVal != nil {
|
|
if v := reflect.ValueOf(str); v.Kind() == reflect.Ptr && v.IsNil() {
|
|
s = "NULL"
|
|
} else {
|
|
panic(panicVal)
|
|
}
|
|
}
|
|
}()
|
|
s = str.String()
|
|
return
|
|
}
|
|
|
|
func safeError(err error) (s interface{}) {
|
|
defer func() {
|
|
if panicVal := recover(); panicVal != nil {
|
|
if v := reflect.ValueOf(err); v.Kind() == reflect.Ptr && v.IsNil() {
|
|
s = nil
|
|
} else {
|
|
panic(panicVal)
|
|
}
|
|
}
|
|
}()
|
|
s = err.Error()
|
|
return
|
|
}
|