Skip to content

Commit c10f231

Browse files
committed
refactor logger
1 parent a65234c commit c10f231

File tree

1 file changed

+51
-47
lines changed

1 file changed

+51
-47
lines changed

src/discordBot/services/logger.js

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,91 @@
11
const { createLogger, format, transports } = require("winston");
2-
const { PapertrailConnection, PapertrailTransport } = require("winston-papertrail");
2+
const {
3+
PapertrailConnection,
4+
PapertrailTransport,
5+
} = require("winston-papertrail");
36

47
let logger;
58

6-
if (process.env.NODE_ENV !== "test") {
7-
const winstonPapertrail = new PapertrailConnection({
8-
host: process.env.PAPERTRAIL_URL,
9-
port: 10737,
10-
});
11-
12-
13-
const paperTrailTransport = new PapertrailTransport(winstonPapertrail);
14-
9+
const setupLogger = () => {
10+
if (process.env.NODE_ENV === "test") return;
1511

16-
const errorStackTracerFormat = format(info => {
12+
const errorStackTracerFormat = format((info) => {
1713
if (info.stack) {
1814
info.message = `${info.message} ${info.stack}`;
1915
}
2016
return info;
2117
});
2218

23-
2419
logger = createLogger({
2520
format: format.combine(
2621
format.errors({ stack: true }),
2722
format.splat(),
2823
format.colorize(),
2924
errorStackTracerFormat(),
30-
format.simple(),
25+
format.simple()
3126
),
32-
transports: [paperTrailTransport],
27+
transports: [],
3328
});
3429

35-
if (process.env.NODE_ENV === "development") {
36-
logger.add(new transports.Console({
30+
logger.add(
31+
new transports.Console({
3732
format: format.simple(),
38-
}));
39-
logger.remove(paperTrailTransport);
40-
}
41-
42-
logger.rejections.handle(
43-
paperTrailTransport,
33+
})
4434
);
4535

46-
logger.exceptions.handle(
47-
paperTrailTransport,
48-
);
36+
if (!process.env.PAPERTRAIL_URL) return;
4937

50-
winstonPapertrail.on("connect", function() {
38+
const winstonPapertrail = new PapertrailConnection({
39+
host: process.env.PAPERTRAIL_URL,
40+
port: 10737,
41+
});
42+
43+
const paperTrailTransport = new PapertrailTransport(winstonPapertrail);
44+
45+
logger.add(paperTrailTransport);
46+
47+
logger.rejections.handle(paperTrailTransport);
48+
49+
logger.exceptions.handle(paperTrailTransport);
50+
51+
winstonPapertrail.on("connect", function () {
5152
logger.info("Logger connected to Papertrail");
5253
});
53-
}
54+
};
55+
56+
setupLogger();
5457

5558
const logError = (error) => {
56-
if (logger) {
57-
logger.error(error);
58-
}
59+
logger.error(error);
5960
};
6061

6162
const logInfo = (message) => {
62-
if (logger) {
63-
logger.info(message);
64-
}
63+
logger.info(message);
6564
};
6665

6766
const logInteractionError = (error, client, interaction) => {
68-
if (logger) {
69-
const member = client.guild.members.cache.get(interaction.member.user.id);
70-
const channel = client.guild.channels.cache.get(interaction.channelId);
71-
const msg = `ERROR DETECTED!\nMember: ${member.displayName}\nCommand: ${interaction.commandName}\nChannel: ${channel.name}}`;
72-
logger.error(msg);
73-
logger.error(error);
74-
}
67+
const member = client.guild.members.cache.get(interaction.member.user.id);
68+
const channel = client.guild.channels.cache.get(interaction.channelId);
69+
const msg = `ERROR DETECTED!\nMember: ${member.displayName}\nCommand: ${interaction.commandName}\nChannel: ${channel.name}}`;
70+
logger.error(msg);
71+
logger.error(error);
7572
};
7673

77-
const logNoInteractionError = async (telegramId, member, channel, client, error) => {
78-
if (logger) {
79-
const msg = `ERROR DETECTED!\nMember: ${member}\nChannel: ${channel}`;
80-
logger.error(msg);
81-
logger.error(error);
82-
}
74+
const logNoInteractionError = async (
75+
telegramId,
76+
member,
77+
channel,
78+
client,
79+
error
80+
) => {
81+
const msg = `ERROR DETECTED!\nMember: ${member}\nChannel: ${channel}`;
82+
logger.error(msg);
83+
logger.error(error);
8384
};
8485

8586
module.exports = {
86-
logError, logInteractionError, logNoInteractionError, logInfo,
87+
logError,
88+
logInteractionError,
89+
logNoInteractionError,
90+
logInfo,
8791
};

0 commit comments

Comments
 (0)