Skip to content

Commit 08aed30

Browse files
committed
gaarf-js@2.11.2: export type winston.Logger as ILogger interface, set exitOnError:false to prevent crashing on logging error (default=true)
Change-Id: Ia14e551ccafe878072df47e970b3e6af482c8bc6
1 parent a70f32e commit 08aed30

File tree

6 files changed

+29
-9
lines changed

6 files changed

+29
-9
lines changed

js/dist/lib/logger-factory.js

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/dist/lib/logger-factory.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "google-ads-api-report-fetcher",
3-
"version": "2.11.1",
3+
"version": "2.11.2",
44
"description": "Google Ads API Report Fetcher (gaarf)",
55
"main": "./dist/index.js",
66
"types": "./src/index.ts",

js/src/lib/logger-factory.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export const defaultTransports: winston.transport[] = [];
6262
defaultTransports.push(
6363
new winston.transports.Console({
6464
format: format.combine(...formats),
65+
handleRejections: LOG_LEVEL === "debug",
6566
})
6667
);
6768

@@ -74,6 +75,7 @@ export function createConsoleLogger(): winston.Logger {
7475
format.timestamp({ format: "YYYY-MM-DD HH:mm:ss:SSS" })
7576
),
7677
transports: defaultTransports,
78+
exitOnError: false,
7779
});
7880
return logger;
7981
}
@@ -105,17 +107,24 @@ export function createCloudLogger(): winston.Logger {
105107
},
106108
useMessageField: false,
107109
redirectToStdout: true,
110+
handleRejections: LOG_LEVEL === "debug",
108111
}),
109112
],
113+
exitOnError: false,
110114
});
111115
return cloudLogger;
112116
}
113117

114118
export function createLogger(): winston.Logger {
119+
let logger;
115120
if (process.env.K_SERVICE) {
116121
// we're in Google Cloud (Run/Functions)
117-
return createCloudLogger();
122+
logger = createCloudLogger();
118123
} else {
119-
return createConsoleLogger();
124+
logger = createConsoleLogger();
120125
}
126+
logger.on("error", (e) => {
127+
console.error(`Error on logging: ${e}`);
128+
});
129+
return logger;
121130
}

js/src/lib/logger.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ import winston from "winston";
1818

1919
let logger: winston.Logger | undefined;
2020

21-
export function getLogger() {
21+
export type ILogger = winston.Logger;
22+
23+
export function getLogger(): ILogger {
2224
if (!logger) {
2325
logger = createLogger();
2426
}

0 commit comments

Comments
 (0)