diff --git a/creator-node/src/services/sync/secondarySyncFromPrimary.js b/creator-node/src/services/sync/secondarySyncFromPrimary.js index 1ed39c561a8..defd726bf94 100644 --- a/creator-node/src/services/sync/secondarySyncFromPrimary.js +++ b/creator-node/src/services/sync/secondarySyncFromPrimary.js @@ -22,6 +22,7 @@ const handleSyncFromPrimary = async ({ forceResyncConfig, forceWipe, logContext, + secondarySyncFromPrimaryLogger, blockNumber = null }) => { const { nodeConfig, redis, libs } = serviceRegistry @@ -33,14 +34,7 @@ const handleSyncFromPrimary = async ({ ) const thisContentNodeEndpoint = nodeConfig.get('creatorNodeEndpoint') - const start = Date.now() - - const logger = createChildLogger(genericLogger, { - wallet, - sync: 'secondarySyncFromPrimary', - primary: creatorNodeEndpoint - }) - logger.info('begin nodesync', 'time', start) + const logger = secondarySyncFromPrimaryLogger let returnValue = {} try { @@ -571,11 +565,7 @@ const handleSyncFromPrimary = async ({ // track that sync for this user was successful await SyncHistoryAggregator.recordSyncSuccess(fetchedWalletPublicKey) - logger.info( - `Sync complete for wallet: ${wallet}. Status: Success. Duration sync: ${ - Date.now() - start - }. From endpoint ${creatorNodeEndpoint}.` - ) + // for final log check the _secondarySyncFromPrimary function return { result: 'success' } } catch (e) { @@ -609,13 +599,8 @@ const handleSyncFromPrimary = async ({ } catch (e) { tracing.recordException(e) await SyncHistoryAggregator.recordSyncFail(wallet) - logger.error( - `Sync complete for wallet: ${wallet}. Status: Error, message: ${ - e.message - }. Duration sync: ${ - Date.now() - start - }. From endpoint ${creatorNodeEndpoint}.` - ) + + // for final log check the _secondarySyncFromPrimary function return _.isEmpty(returnValue) ? { @@ -669,6 +654,16 @@ async function _secondarySyncFromPrimary({ if (forceResyncConfig?.forceResync) mode = 'force_resync' if (forceWipe) mode = 'force_wipe' + const start = Date.now() + + const secondarySyncFromPrimaryLogger = createChildLogger(genericLogger, { + wallet, + sync: 'secondarySyncFromPrimary', + primary: creatorNodeEndpoint + }) + + secondarySyncFromPrimaryLogger.info('begin nodesync', 'time', start) + const { error, result } = await handleSyncFromPrimary({ serviceRegistry, wallet, @@ -676,14 +671,28 @@ async function _secondarySyncFromPrimary({ blockNumber, forceResyncConfig, forceWipe, - logContext + logContext, + secondarySyncFromPrimaryLogger }) metricEndTimerFn({ result, mode }) tracing.setSpanAttribute('result', result) tracing.setSpanAttribute('mode', mode) if (error) { + secondarySyncFromPrimaryLogger.error( + `Sync complete for wallet: ${wallet}. Status: Error, message: ${ + error.message + }. Duration sync: ${ + Date.now() - start + }. From endpoint ${creatorNodeEndpoint}. Prometheus result: ${result}` + ) throw new Error(error) + } else { + secondarySyncFromPrimaryLogger.info( + `Sync complete for wallet: ${wallet}. Status: Success. Duration sync: ${ + Date.now() - start + }. From endpoint ${creatorNodeEndpoint}. Prometheus result: ${result}` + ) } return { result }