Skip to content

Commit e1ce895

Browse files
authored
Remove logs during termination (#298)
1 parent e22dc65 commit e1ce895

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

src/app/standalone.ts

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { arch, platform } from 'os';
1+
import { arch, machine, platform, release, type } from 'os';
22
import { createConnection, ProposedFeatures } from 'vscode-languageserver/node';
33
import { InitializedParams } from 'vscode-languageserver-protocol';
44
import { LspCapabilities } from '../protocol/LspCapabilities';
@@ -11,7 +11,7 @@ import { ExtensionName } from '../utils/ExtensionConfig';
1111

1212
let server: unknown;
1313

14-
/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access */
14+
/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, no-console */
1515
async function onInitialize(params: ExtendedInitializeParams) {
1616
const ClientInfo = params.clientInfo;
1717
const AwsMetadata = params.initializationOptions?.['aws'];
@@ -32,7 +32,7 @@ async function onInitialize(params: ExtendedInitializeParams) {
3232
`${ExtensionName} initializing...`,
3333
);
3434
getLogger().info({
35-
Machine: `${platform()}-${arch()}`,
35+
Machine: `${type()}-${platform()}-${arch()}-${machine()}-${release()}`,
3636
Process: `${process.platform}-${process.arch}`,
3737
Runtime: `node=${process.versions.node} v8=${process.versions.v8} uv=${process.versions.uv} modules=${process.versions.modules}`,
3838
});
@@ -53,12 +53,12 @@ function onInitialized(params: InitializedParams) {
5353
}
5454

5555
function onShutdown() {
56-
getLogger().info(`${ExtensionName} shutting down...`);
56+
console.info(`${ExtensionName} shutting down...`);
5757
return (server as any).close();
5858
}
5959

6060
function onExit() {
61-
getLogger().info(`${ExtensionName} exiting`);
61+
console.info(`${ExtensionName} exiting`);
6262
}
6363

6464
const lsp = new LspConnection(createConnection(ProposedFeatures.all), {
@@ -70,11 +70,22 @@ const lsp = new LspConnection(createConnection(ProposedFeatures.all), {
7070
lsp.listen();
7171

7272
process.on('unhandledRejection', (reason, _promise) => {
73-
getLogger().error(reason, 'Unhandled promise rejection');
73+
console.error(reason, 'Unhandled promise rejection');
74+
75+
try {
76+
getLogger().error(reason, 'Unhandled promise rejection');
77+
} catch {
78+
// do nothing
79+
}
7480
});
7581

7682
process.on('uncaughtException', (error, origin) => {
77-
getLogger().error(error, `Uncaught exception ${origin}`);
83+
console.error(error, `Unhandled exception ${origin}`);
84+
try {
85+
getLogger().error(error, `Uncaught exception ${origin}`);
86+
} catch {
87+
// do nothing
88+
}
7889
});
7990

8091
function getLogger() {

src/server/CfnInfraCore.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { DiagnosticCoordinator } from '../services/DiagnosticCoordinator';
1010
import { SettingsManager } from '../settings/SettingsManager';
1111
import { ValidationManager } from '../stacks/actions/ValidationManager';
1212
import { ClientMessage } from '../telemetry/ClientMessage';
13-
import { LoggerFactory } from '../telemetry/LoggerFactory';
1413
import { TelemetryService } from '../telemetry/TelemetryService';
1514
import { Closeable, closeSafely } from '../utils/Closeable';
1615
import { Configurable, Configurables } from '../utils/Configurable';
@@ -76,13 +75,6 @@ export class CfnInfraCore implements Configurables, Closeable {
7675
}
7776

7877
async close() {
79-
return await closeSafely(
80-
this.documentManager,
81-
this.dataStoreFactory,
82-
TelemetryService.instance,
83-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
84-
// @ts-ignore
85-
LoggerFactory._instance,
86-
);
78+
return await closeSafely(this.documentManager, this.dataStoreFactory, TelemetryService.instance);
8779
}
8880
}

0 commit comments

Comments
 (0)