TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1889 from nspcc-dev/tune-logging

Browse source 
Tune logging
This commit is contained in:
Roman Khimov 2021-04-07 20:58:52 +03:00 committed by GitHub
commit 46d866965d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/core/blockchain.go
View file

@ -1092,9 +1092,9 @@ func (bc *Blockchain) persist() error {
if err != nil { if err != nil {
return err return err
} }
bc.log.Info("blockchain persist completed", bc.log.Info("persisted to disk",
zap.Uint32("persistedBlocks", diff), zap.Uint32("blocks", diff),
zap.Int("persistedKeys", persisted), zap.Int("keys", persisted),
zap.Uint32("headerHeight", storedHeaderHeight), zap.Uint32("headerHeight", storedHeaderHeight),
zap.Uint32("blockHeight", bHeight), zap.Uint32("blockHeight", bHeight),
zap.Duration("took", time.Since(start))) zap.Duration("took", time.Since(start)))

10
pkg/core/interop/runtime/engine.go
View file

@ -82,10 +82,14 @@ func Log(ic *interop.Context) error {
if len(state) > MaxNotificationSize { if len(state) > MaxNotificationSize {
return fmt.Errorf("message length shouldn't exceed %v", MaxNotificationSize) return fmt.Errorf("message length shouldn't exceed %v", MaxNotificationSize)
} }
msg := fmt.Sprintf("%q", state) var txHash string
if ic.Tx != nil {
txHash = ic.Tx.Hash().StringLE()
}
ic.Log.Info("runtime log", ic.Log.Info("runtime log",
zap.Stringer("script", ic.VM.GetCurrentScriptHash()), zap.String("tx", txHash),
zap.String("logs", msg)) zap.String("script", ic.VM.GetCurrentScriptHash().StringLE()),
zap.String("msg", state))
return nil return nil
} }

6
pkg/core/interop/runtime/engine_test.go
View file

@ -125,10 +125,8 @@ func TestLog(t *testing.T) {
var logMsg map[string]interface{} var logMsg map[string]interface{}
require.NoError(t, json.Unmarshal([]byte(ls[0]), &logMsg)) require.NoError(t, json.Unmarshal([]byte(ls[0]), &logMsg))
require.Equal(t, "info", logMsg["level"]) require.Equal(t, "info", logMsg["level"])
require.Equal(t, "runtime log", logMsg["msg"]) require.Equal(t, "hello", logMsg["msg"])
require.Equal(t, h.StringBE(), logMsg["script"]) require.Equal(t, h.StringLE(), logMsg["script"])
require.Equal(t, `"hello"`, logMsg["logs"])
}) })
} }