mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-01 13:48:56 +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>
103 lines
3.0 KiB
Go
103 lines
3.0 KiB
Go
package log
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/go-stack/stack"
|
|
)
|
|
|
|
// A Valuer generates a log value. When passed to With or WithPrefix in a
|
|
// value element (odd indexes), it represents a dynamic value which is re-
|
|
// evaluated with each log event.
|
|
type Valuer func() interface{}
|
|
|
|
// bindValues replaces all value elements (odd indexes) containing a Valuer
|
|
// with their generated value.
|
|
func bindValues(keyvals []interface{}) {
|
|
for i := 1; i < len(keyvals); i += 2 {
|
|
if v, ok := keyvals[i].(Valuer); ok {
|
|
keyvals[i] = v()
|
|
}
|
|
}
|
|
}
|
|
|
|
// containsValuer returns true if any of the value elements (odd indexes)
|
|
// contain a Valuer.
|
|
func containsValuer(keyvals []interface{}) bool {
|
|
for i := 1; i < len(keyvals); i += 2 {
|
|
if _, ok := keyvals[i].(Valuer); ok {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// Timestamp returns a timestamp Valuer. It invokes the t function to get the
|
|
// time; unless you are doing something tricky, pass time.Now.
|
|
//
|
|
// Most users will want to use DefaultTimestamp or DefaultTimestampUTC, which
|
|
// are TimestampFormats that use the RFC3339Nano format.
|
|
func Timestamp(t func() time.Time) Valuer {
|
|
return func() interface{} { return t() }
|
|
}
|
|
|
|
// TimestampFormat returns a timestamp Valuer with a custom time format. It
|
|
// invokes the t function to get the time to format; unless you are doing
|
|
// something tricky, pass time.Now. The layout string is passed to
|
|
// Time.Format.
|
|
//
|
|
// Most users will want to use DefaultTimestamp or DefaultTimestampUTC, which
|
|
// are TimestampFormats that use the RFC3339Nano format.
|
|
func TimestampFormat(t func() time.Time, layout string) Valuer {
|
|
return func() interface{} {
|
|
return timeFormat{
|
|
time: t(),
|
|
layout: layout,
|
|
}
|
|
}
|
|
}
|
|
|
|
// A timeFormat represents an instant in time and a layout used when
|
|
// marshaling to a text format.
|
|
type timeFormat struct {
|
|
time time.Time
|
|
layout string
|
|
}
|
|
|
|
func (tf timeFormat) String() string {
|
|
return tf.time.Format(tf.layout)
|
|
}
|
|
|
|
// MarshalText implements encoding.TextMarshaller.
|
|
func (tf timeFormat) MarshalText() (text []byte, err error) {
|
|
// The following code adapted from the standard library time.Time.Format
|
|
// method. Using the same undocumented magic constant to extend the size
|
|
// of the buffer as seen there.
|
|
b := make([]byte, 0, len(tf.layout)+10)
|
|
b = tf.time.AppendFormat(b, tf.layout)
|
|
return b, nil
|
|
}
|
|
|
|
// Caller returns a Valuer that returns a file and line from a specified depth
|
|
// in the callstack. Users will probably want to use DefaultCaller.
|
|
func Caller(depth int) Valuer {
|
|
return func() interface{} { return stack.Caller(depth) }
|
|
}
|
|
|
|
var (
|
|
// DefaultTimestamp is a Valuer that returns the current wallclock time,
|
|
// respecting time zones, when bound.
|
|
DefaultTimestamp = TimestampFormat(time.Now, time.RFC3339Nano)
|
|
|
|
// DefaultTimestampUTC is a Valuer that returns the current time in UTC
|
|
// when bound.
|
|
DefaultTimestampUTC = TimestampFormat(
|
|
func() time.Time { return time.Now().UTC() },
|
|
time.RFC3339Nano,
|
|
)
|
|
|
|
// DefaultCaller is a Valuer that returns the file and line where the Log
|
|
// method was invoked. It can only be used with log.With.
|
|
DefaultCaller = Caller(3)
|
|
)
|