Skip to content

Commit

Permalink
fix(request-node): log config (#1125)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjlevesque committed Jul 12, 2023
1 parent 286a3a7 commit 9775de8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
21 changes: 8 additions & 13 deletions packages/request-node/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,19 +190,14 @@ export function getMnemonic(): string {
return process.env.MNEMONIC;
}

/**
* Get log configs: level and mode, from command line argument, environment variables or default values.
* logLevel is the maximum level of messages we will log
* logMode defines the log format to display: `human` is a more readable log, `machine` is better for parsing
*
* @returns the log level
*/
export function getLogConfig(): { logLevel: LogTypes.LogLevel; logMode: LogMode } {
return {
logLevel: getOption('logLevel', 'LOG_LEVEL', defaultValues.log.level),
logMode: getOption('logMode', 'LOG_MODE', defaultValues.log.mode),
};
}
/** logLevel is the maximum level of messages we will log */
export const getLogLevel = (): LogTypes.LogLevel => {
const logLevelStr = getOption<keyof typeof LogTypes.LogLevel>('logLevel', 'LOG_LEVEL');
return LogTypes.LogLevel[logLevelStr] || defaultValues.log.level;
};

/** logMode defines the log format to display: `human` is a more readable log, `machine` is better for parsing */
export const getLogMode = makeOption('logMode', 'LOG_MODE', defaultValues.log.mode);

/**
* Get the minimum delay between getLastBlockNumber calls
Expand Down
9 changes: 5 additions & 4 deletions packages/request-node/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node
import { LogTypes } from '@requestnetwork/types';
import * as yargs from 'yargs';
import { LogTypes } from '@requestnetwork/types';
import * as config from './config';
import { Logger } from './logger';
import { RequestNode } from './requestNode';
Expand All @@ -9,15 +9,16 @@ import { TheGraphRequestNode } from './thegraph-node';

const argv = yargs.parseSync();

const logLevel = config.getLogLevel();
const logMode = config.getLogMode();
// Initialize the node logger
const { logLevel, logMode } = config.getLogConfig();
const logger = new Logger(logLevel, logMode);

const startNode = async (): Promise<void> => {
const serverMessage = `Using config:
Ethereum network id: ${config.getStorageNetworkId()}
Log Level: ${LogTypes.LogLevel[config.getLogConfig().logLevel]}
Log Mode: ${config.getLogConfig().logMode}
Log Level: ${LogTypes.LogLevel[logLevel]}
Log Mode: ${logMode}
Web3 provider url: ${config.getStorageWeb3ProviderUrl()}
TheGraph url: ${config.getGraphNodeUrl()}
IPFS host: ${config.getIpfsHost()}
Expand Down

0 comments on commit 9775de8

Please sign in to comment.