update logging

AcalaNetwork · Jan 25, 2024 · 2349e16 · 2349e16
1 parent 4e31b52
commit 2349e16
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/packages/chopsticks/src/rpc/index.ts b/packages/chopsticks/src/rpc/index.ts
@@ -9,7 +9,7 @@ import {
 
 import { loadRpcPlugin, rpcPluginMethods } from '../plugins/index.js'
 
-const rpcLogger = defaultLogger.child({ module: 'rpc' })
+const rpcLogger = defaultLogger.child({ name: 'rpc' })
 
 const allHandlers: Handlers = {
   ...substrate,

diff --git a/packages/chopsticks/src/server.ts b/packages/chopsticks/src/server.ts
@@ -124,7 +124,7 @@ export const createServer = async (handler: Handler, port?: number) => {
           result: resp ?? null,
         }
       } catch (e) {
-        logger.info('Error handling request: %s %o', e, (e as Error).stack)
+        logger.info('Error handling request: %o', (e as Error).stack)
         return {
           id: req.id,
           jsonrpc: '2.0',

diff --git a/packages/core/src/blockchain/block-builder.ts b/packages/core/src/blockchain/block-builder.ts
@@ -178,10 +178,10 @@ export const buildBlock = async (
   logger.info(
     {
       number: newBlockNumber,
-      extrinsicsCount: extrinsics.length,
+      extrinsics: extrinsics.map(truncate),
       umpCount: Object.keys(ump).length,
     },
-    `Try building block #${newBlockNumber.toLocaleString()}`,
+    `${await head.chain.api.getSystemChain()} building #${newBlockNumber.toLocaleString()}`,
   )
 
   let layer: StorageLayer | undefined
@@ -319,13 +319,13 @@ export const buildBlock = async (
 
   logger.info(
     {
-      number: newBlock.number,
+      number: finalBlock.number,
       hash: finalBlock.hash,
       extrinsics: truncate(includedExtrinsic),
-      pendingExtrinsicsCount: pendingExtrinsics.length,
+      pendingExtrinsics: pendingExtrinsics.map(truncate),
       ump: truncate(ump),
     },
-    'Block built',
+    `${await head.chain.api.getSystemChain()} new head #${finalBlock.number.toLocaleString()}`,
   )
 
   return [finalBlock, pendingExtrinsics]

diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts
@@ -1,14 +1,16 @@
 import { pino } from 'pino'
 
-export const pinoLogger = pino({
+export const defaultLogger = pino({
   level: (typeof process === 'object' && process.env.LOG_LEVEL) || 'info',
   transport: {
     target: 'pino-pretty',
+    options: {
+      ignore: 'pid,hostname',
+      hideObject: !!process.env.LOG_COMPACT,
+    },
   },
 })
 
-export const defaultLogger = pinoLogger.child({ app: 'chopsticks' })
-
 const innerTruncate =
   (level = 0) =>
   (val: any) => {

diff --git a/packages/core/src/utils/decoder.ts b/packages/core/src/utils/decoder.ts
@@ -12,7 +12,7 @@ import _ from 'lodash'
 import { decodeWellKnownKey } from './well-known-keys.js'
 import { defaultLogger } from '../logger.js'
 
-const logger = defaultLogger.child({ module: 'decoder' })
+const logger = defaultLogger.child({ name: 'decoder' })
 
 const _CACHE: LRUCache<Registry, LRUCache<HexString, StorageEntry>> = new LRUCache({ max: 20 /* max 20 registries */ })
 

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -14,7 +14,7 @@ import { HexString } from '@polkadot/util/types'
 import { Keyring, createTestKeyring } from '@polkadot/keyring'
 import { SubmittableExtrinsic } from '@polkadot/api-base/types'
 
-const logger = defaultLogger.child({ module: 'utils' })
+const logger = defaultLogger.child({ name: 'utils' })
 
 export * from './signFake.js'