Skip to content

Commit daf1d92

Browse files
author
Brian Faust
committed
fix: resolve logger as log from container
1 parent 77893fd commit daf1d92

File tree

50 files changed

+70
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+70
-70
lines changed

packages/core-api/src/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { app, Contracts } from "@arkecosystem/core-kernel";
33
import Hapi from "@hapi/hapi";
44

55
export class Server {
6-
private logger = app.resolve<Contracts.Kernel.ILogger>("logger");
6+
private logger = app.resolve<Contracts.Kernel.ILogger>("log");
77

88
private http: any;
99
private https: any;

packages/core-api/src/service-provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Server } from "./server";
55
export class ServiceProvider extends Support.AbstractServiceProvider {
66
public async register(): Promise<void> {
77
if (!this.opts.enabled) {
8-
this.app.resolve<Contracts.Kernel.ILogger>("logger").info("Public API is disabled");
8+
this.app.resolve<Contracts.Kernel.ILogger>("log").info("Public API is disabled");
99
return;
1010
}
1111

@@ -18,7 +18,7 @@ export class ServiceProvider extends Support.AbstractServiceProvider {
1818

1919
public async dispose(): Promise<void> {
2020
if (this.opts.enabled) {
21-
this.app.resolve<Contracts.Kernel.ILogger>("logger").info(`Stopping Public API`);
21+
this.app.resolve<Contracts.Kernel.ILogger>("log").info(`Stopping Public API`);
2222

2323
await this.app.resolve<Server>("api").stop();
2424
}

packages/core-blockchain/src/processor/block-processor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export enum BlockProcessorResult {
2323
}
2424

2525
export class BlockProcessor {
26-
private readonly logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("logger");
26+
private readonly logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("log");
2727

2828
public constructor(private readonly blockchain: Blockchain) {}
2929

packages/core-blockchain/src/processor/handlers/block-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Blockchain } from "../../blockchain";
44
import { BlockProcessorResult } from "../block-processor";
55

66
export abstract class BlockHandler {
7-
protected readonly logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("logger");
7+
protected readonly logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("log");
88

99
public constructor(protected readonly blockchain: Blockchain, protected readonly block: Interfaces.IBlock) {}
1010

packages/core-blockchain/src/replay/replay-blockchain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class ReplayBlockchain extends Blockchain {
2525
this.walletManager = new Wallets.WalletManager();
2626
this.memoryDatabase = new MemoryDatabaseService(this.walletManager);
2727

28-
this.logger = app.resolve<Contracts.Kernel.ILogger>("logger");
28+
this.logger = app.resolve<Contracts.Kernel.ILogger>("log");
2929
this.localDatabase = app.resolve<Contracts.Database.IDatabaseService>("database");
3030
this.localDatabase.walletManager = this.walletManager;
3131

packages/core-blockchain/src/state-machine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
117117
},
118118

119119
async init() {
120-
logger = app.resolve<Contracts.Kernel.ILogger>("logger");
120+
logger = app.resolve<Contracts.Kernel.ILogger>("log");
121121
stateStorage = app.resolve<Contracts.State.IStateService>("state").getStore();
122122
blockchainMachine.state = stateStorage;
123123

packages/core-blockchain/src/utils/tick-sync-tracker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const tickSyncTracker = (blockCount, count): void => {
4444
secondsDecimalDigits: 0,
4545
});
4646

47-
app.resolve<Contracts.Kernel.ILogger>("logger").info(
47+
app.resolve<Contracts.Kernel.ILogger>("log").info(
4848
`Synchronising In Progress (${blocksDownloaded} of ${networkHeight} blocks - Est. ${timeLeft})`,
4949
);
5050
}

packages/core-blockchain/src/utils/validate-generator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Crypto, Interfaces } from "@arkecosystem/crypto";
44

55
export const validateGenerator = async (block: Interfaces.IBlock): Promise<boolean> => {
66
const database: Contracts.Database.IDatabaseService = app.resolve<Contracts.Database.IDatabaseService>("database");
7-
const logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("logger");
7+
const logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("log");
88

99
const roundInfo: Contracts.Shared.IRoundInfo = roundCalculator.calculateRound(block.data.height);
1010
const delegates: Contracts.State.IWallet[] = await database.getActiveDelegates(roundInfo);

packages/core-database-postgres/src/postgres-connection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class PostgresConnection implements Contracts.Database.IConnection {
3131
public walletsRepository: Contracts.Database.IWalletsRepository;
3232
// @TODO: make this private
3333
public pgp: IMain;
34-
private readonly logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("logger");
34+
private readonly logger: Contracts.Kernel.ILogger = app.resolve<Contracts.Kernel.ILogger>("log");
3535
private readonly emitter: Contracts.Kernel.IEventDispatcher = app.resolve<Contracts.Kernel.IEventDispatcher>(
3636
"events",
3737
);

packages/core-database-postgres/src/service-provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { PostgresConnection } from "./postgres-connection";
66

77
export class ServiceProvider extends Support.AbstractServiceProvider {
88
public async register(): Promise<void> {
9-
this.app.resolve<Contracts.Kernel.ILogger>("logger").info("Establishing Database Connection");
9+
this.app.resolve<Contracts.Kernel.ILogger>("log").info("Establishing Database Connection");
1010

1111
const walletManager = new Wallets.WalletManager();
1212

@@ -17,7 +17,7 @@ export class ServiceProvider extends Support.AbstractServiceProvider {
1717
}
1818

1919
public async dispose(): Promise<void> {
20-
this.app.resolve<Contracts.Kernel.ILogger>("logger").info("Closing Database Connection");
20+
this.app.resolve<Contracts.Kernel.ILogger>("log").info("Closing Database Connection");
2121

2222
await this.app.resolve<Contracts.Database.IDatabaseService>("database").connection.disconnect();
2323
}

0 commit comments

Comments
 (0)