mirror of
https://github.com/status-im/status-go.git
synced 2026-09-01 09:31:12 +00:00
Igor Sirotin
f3e4363808
Part of the Go project layout migration, item 27. Pure move plus import-path rewrite across 502 files. No API or behaviour change. `internal/` keeps the messaging application logic unimportable from outside the module, which is what the issue asks for -- status-go is consumed through the C-bindings in mobile/, not as a Go library. Things that had to follow the move, beyond the Go imports: - tools/generate-handlers/template.txt. messenger_handlers.go is generated, and the template hard-codes the imports it emits, so the generated file kept importing protocol/common and failed typecheck. - .gitignore. The ignore rule for that generated file was pinned to the old path; without moving it, a 1486-line generated file starts being tracked. - Makefile: the logosstorage and torrent test targets (both the archive packages and ./protocol itself), the archive README, migration-protocol. - scripts/run_unit_tests.sh, which names the protocol package explicitly to shard its tests. - scripts/cleanup_generated_files.sh and .golangci.yml. scripts/migration_check.sh also needed a fix that is not specific to this move: it validated every file the branch touched under a migration dir against the timestamp naming rule, and a directory rename makes every migration in it look newly added. It now excludes renames, so moving a migration is not mistaken for adding one. refs #7067
52 lines
1.0 KiB
Go
52 lines
1.0 KiB
Go
package logutils
|
|
|
|
import (
|
|
"io"
|
|
"sync"
|
|
"time"
|
|
|
|
"go.uber.org/zap"
|
|
"go.uber.org/zap/zapcore"
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
|
|
"github.com/status-im/status-go/internal/protocol/zaputil"
|
|
)
|
|
|
|
var (
|
|
_zapLogger *zap.Logger
|
|
_initZapLogger sync.Once
|
|
)
|
|
|
|
func ZapLogger() *zap.Logger {
|
|
_initZapLogger.Do(func() {
|
|
_zapLogger = defaultLogger()
|
|
|
|
// forward geth logs to zap logger
|
|
log.SetDefault(newGethAdapter(_zapLogger.Named("geth")))
|
|
})
|
|
return _zapLogger
|
|
}
|
|
|
|
func defaultLogger() *zap.Logger {
|
|
core := NewCore(
|
|
defaultEncoder(),
|
|
zapcore.AddSync(io.Discard),
|
|
zap.NewAtomicLevelAt(zap.InfoLevel),
|
|
)
|
|
return zap.New(newNamespaceFilteringCore(core), zap.AddCaller())
|
|
}
|
|
|
|
func defaultEncoder() zapcore.Encoder {
|
|
encoderConfig := zap.NewDevelopmentEncoderConfig()
|
|
encoderConfig.EncodeTime = utcTimeEncoder(encoderConfig.EncodeTime)
|
|
|
|
return zaputil.NewConsoleHexEncoder(encoderConfig)
|
|
}
|
|
|
|
func utcTimeEncoder(encoder zapcore.TimeEncoder) zapcore.TimeEncoder {
|
|
return func(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
|
|
encoder(t.UTC(), enc)
|
|
}
|
|
}
|