Updated logs

Author: vardan10

services/blockchain-connector/app.js

@@ -32,9 +32,9 @@ const app = Microservice({
 	brokerTimeout: config.brokerTimeout, // in seconds
 	logger: config.log,
 	events: {
-		genesisBlockIndexed: async () => {
-			logger.debug("Received a 'genesisBlockIndexed' moleculer event from indexer.");
-			Signals.get('genesisBlockIndexed').dispatch();
+		'update.index.status': async payload => {
+			logger.debug("Received a 'update.index.status' moleculer event from indexer.");
+			Signals.get('updateIndexStatus').dispatch(payload);
 		},
 	},
 });

services/blockchain-connector/config.js

@@ -115,6 +115,7 @@ config.job = {
 config.apiClient = {
 	heartbeatAckMaxWaitTime: Number(process.env.HEARTBEAT_ACK_MAX_WAIT_TIME) || 1000, // in millisecs
 	aliveAssumptionTime: Number(process.env.CLIENT_ALIVE_ASSUMPTION_TIME) || 5 * 1000, // in millisecs
+	aliveAssumptionTimeBeforeGenesis: Number(30 * 1000),
 	instantiation: {
 		maxWaitTime: Number(process.env.CLIENT_INSTANTIATION_MAX_WAIT_TIME) || 5 * 1000, // in millisecs
 		retryInterval: Number(process.env.CLIENT_INSTANTIATION_RETRY_INTERVAL) || 1, // in millisecs

services/blockchain-connector/shared/sdk/client.js

@@ -33,6 +33,8 @@ const MAX_INSTANTIATION_WAIT_TIME = config.apiClient.instantiation.maxWaitTime;
 const NUM_REQUEST_RETRIES = config.apiClient.request.maxRetries;
 const ENDPOINT_INVOKE_RETRY_DELAY = config.apiClient.request.retryDelay;
 const CLIENT_ALIVE_ASSUMPTION_TIME = config.apiClient.aliveAssumptionTime;
+const CLIENT_ALIVE_ASSUMPTION_TIME_BEFORE_GENESIS =
+	config.apiClient.aliveAssumptionTimeBeforeGenesis;
 const HEARTBEAT_ACK_MAX_WAIT_TIME = config.apiClient.heartbeatAckMaxWaitTime;
 
 // Caching and flags
@@ -42,6 +44,7 @@ let lastClientAliveTime;
 let heartbeatCheckBeginTime;
 let isInstantiating = false;
 let isClientAlive = false;
+let isGenesisBlockIndexed = false;
 
 const pongListener = res => {
 	isClientAlive = true;
@@ -171,19 +174,29 @@ if (config.isUseLiskIPCClient) {
 	};
 
 	const genesisBlockDownloadedListener = () => {
-		triggerRegularClientLivelinessChecks(30 * 1000);
-
-		// Incase genesisBlockIndexed event is not triggered by indexer wait for max 15 mins for genesis block to get indexed
-		setTimeout(() => Signals.get('genesisBlockIndexed').dispatch(), 15 * 60 * 1000);
+		triggerRegularClientLivelinessChecks(CLIENT_ALIVE_ASSUMPTION_TIME_BEFORE_GENESIS);
+		logger.info(
+			`Updated node liveliness check to occur to every ${CLIENT_ALIVE_ASSUMPTION_TIME_BEFORE_GENESIS} seconds. Will update again after checking of genesis block is indexed.`,
+		);
 	};
 
-	const genesisBlockIndexedListener = () => {
-		clearInterval(intervalTimeout);
-		triggerRegularClientLivelinessChecks(CLIENT_ALIVE_ASSUMPTION_TIME);
+	const genesisBlockIndexedListener = indexStatus => {
+		if (
+			!isGenesisBlockIndexed &&
+			indexStatus.data &&
+			indexStatus.data.genesisHeight < indexStatus.data.lastIndexedBlockHeight
+		) {
+			clearInterval(intervalTimeout);
+			triggerRegularClientLivelinessChecks(CLIENT_ALIVE_ASSUMPTION_TIME);
+			isGenesisBlockIndexed = true;
+			logger.info(
+				`Updated node liveliness check to occur to every ${CLIENT_ALIVE_ASSUMPTION_TIME} seconds since genesis block is indexed.`,
+			);
+		}
 	};
 
 	Signals.get('genesisBlockDownloaded').add(genesisBlockDownloadedListener);
-	Signals.get('genesisBlockIndexed').add(genesisBlockIndexedListener);
+	Signals.get('updateIndexStatus').add(genesisBlockIndexedListener);
 }
 
 module.exports = {

services/blockchain-connector/shared/sdk/events.js

@@ -104,7 +104,7 @@ const ensureAPIClientLiveness = () => {
 		}, config.clientConnVerifyInterval);
 	} else {
 		logger.info(
-			`Cannot start the events-based client liveness check yet. Either the node is not yet synced or the genesis block hasn't been downloaded yet.\nisNodeSynced: ${isNodeSynced}, isGenesisBlockDownloaded: ${isGenesisBlockDownloaded}.`,
+			`Cannot start the events-based client liveness check yet. Either the node is not yet synced or the genesis block hasn't been downloaded yet.\nisNodeSynced: ${isNodeSynced}, isGenesisBlockDownloaded: ${isGenesisBlockDownloaded}`,
 		);
 	}
 };

services/blockchain-indexer/events/blockchain.js

@@ -35,7 +35,7 @@ module.exports = [
 				try {
 					if (payload && Array.isArray(payload.data)) {
 						const [block] = payload.data;
-						logger.debug(`New block arrived (${block.id})...`);
+						logger.debug(`Received new block (${block.id})...`);
 						// Fork detection
 						if (localPreviousBlockId) {
 							if (localPreviousBlockId !== block.previousBlockId) {
@@ -68,7 +68,7 @@ module.exports = [
 
 						if (numberOfTransactions > 0) {
 							logger.debug(
-								`Block (${block.id}) arrived containing ${block.numberOfTransactions} new transactions.`,
+								`Received block (${block.id}) containing ${block.numberOfTransactions} new transactions.`,
 							);
 
 							const formattedTransactions = await formatTransactionsInBlock(block);
@@ -161,7 +161,7 @@ module.exports = [
 		description: 'Returns true when the index is ready',
 		controller: callback => {
 			const indexStatusListener = async payload => {
-				logger.debug("Dispatching 'index.ready' event over message broker.");
+				logger.debug("Dispatching 'index.ready' event to message broker.");
 				callback(payload);
 			};
 			Signals.get('blockIndexReady').add(indexStatusListener);
@@ -172,21 +172,10 @@ module.exports = [
 		description: 'Emit index status updates.',
 		controller: callback => {
 			const indexStatusUpdateListener = async payload => {
-				logger.debug("Dispatching 'update.index.status' event over message broker.");
+				logger.debug("Dispatching 'update.index.status' event to message broker.");
 				callback(payload);
 			};
 			Signals.get('updateIndexStatus').add(indexStatusUpdateListener);
 		},
 	},
-	{
-		name: 'genesisBlockIndexed',
-		description: 'Emit event after genesis block is indexed.',
-		controller: callback => {
-			const genesisBlockIndexedListener = async () => {
-				logger.debug("Dispatching 'genesisBlockIndexed' event over message broker.");
-				callback();
-			};
-			Signals.get('genesisBlockIndexed').add(genesisBlockIndexedListener);
-		},
-	},
 ];

services/blockchain-indexer/shared/dataService/blocks.js

@@ -44,10 +44,10 @@ const getBlocksFromServer = async params => {
 		meta: {},
 	};
 
-	if (params.blockID) logger.debug(`Retrieved block with ID ${params.blockID} from Lisk Core.`);
+	if (params.blockID) logger.debug(`Retrieved block with ID ${params.blockID} from the node.`);
 	else if (params.height)
-		logger.debug(`Retrieved block with height: ${params.height} from Lisk Core.`);
-	else logger.debug(`Retrieved block with custom search: ${util.inspect(params)} from Lisk Core.`);
+		logger.debug(`Retrieved block with height: ${params.height} from the node.`);
+	else logger.debug(`Retrieved block with custom search: ${util.inspect(params)} from the node.`);
 
 	const response = await business.getBlocks(params);
 	if (response.data) blocks.data = response.data;

services/blockchain-indexer/shared/indexer/blockchainIndex.js

@@ -378,10 +378,6 @@ const indexBlock = async job => {
 		logger.info(
 			`Successfully indexed block ${blockToIndexFromNode.id} at height ${blockToIndexFromNode.height}.`,
 		);
-
-		if (blockToIndexFromNode.height === genesisHeight) {
-			Signals.get('genesisBlockIndexed').dispatch();
-		}
 	} catch (error) {
 		// Stop genesisAsset index progress logging on errors
 		if (blockToIndexFromNode.height === genesisHeight) {

services/export/jobs/purge.js

@@ -28,7 +28,7 @@ module.exports = [
 		interval: config.job.purgeCache.interval,
 		schedule: config.job.purgeCache.schedule,
 		controller: () => {
-			logger.info('Performing cache maintenance.');
+			logger.info('Running cache maintenance.');
 			partials.purge();
 			staticFiles.purge();
 		},

services/fee-estimator/shared/utils/dynamicFees.js

@@ -93,7 +93,7 @@ const getEstimateFeePerByteForBatch = async (fromHeight, toHeight, cacheKey) =>
 	await cacheRedisFees.set(cacheKey, feeEstPerByte);
 
 	logger.info(
-		`Recalulated dynamic fees: L: ${feeEstPerByte.low} M: ${feeEstPerByte.med} H: ${feeEstPerByte.high}.`,
+		`Re-calulated dynamic fees: L: ${feeEstPerByte.low} M: ${feeEstPerByte.med} H: ${feeEstPerByte.high}.`,
 	);
 
 	return feeEstPerByte;

services/gateway/shared/ready.js

@@ -60,7 +60,7 @@ const getReady = () => {
 		});
 		return { services: includeSvcForReadiness };
 	} catch (_) {
-		logger.error(`Current service status: ${currentSvcStatus}.`);
+		logger.error(`Current service status:\nJSON.stringify(${currentSvcStatus}, null, '\t')`);
 		throw new MoleculerError('Service Unavailable', 503, 'SERVICES_NOT_READY');
 	}
 };

services/market/jobs/pricesUpdate.js

@@ -29,7 +29,7 @@ module.exports = [
 			await updatePrices();
 		},
 		controller: async () => {
-			logger.debug('Job scheduled to maintain updated market prices.');
+			logger.debug('Job scheduled to update market prices.');
 			await updatePrices();
 		},
 	},

services/transaction-statistics/shared/buildTransactionStatistics.js

@@ -130,7 +130,7 @@ const insertToDB = async (statsList, date) => {
 			await transactionStatisticsTable.deleteByPrimaryKey([id]);
 			logger.debug(`Removed the following date from the database: ${date}.`);
 		} catch (err) {
-			logger.debug(`The database does not contain the entry with the following date: ${date}.`);
+			logger.debug(`The database does not contain an entry with the following date: ${date}.`);
 		}
 
 		statsList.map(statistic => {