Navy.gif/logger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Navy.gif:6b8692e63a8e8716d4e8985443828840de6a88bf
Branches Tags
Navy.gif:master
..
compare: Navy.gif:40f6bc572e06ecfafefd045a27fb4254f094aae1
Branches Tags
Navy.gif:master

No commits in common. "6b8692e63a8e8716d4e8985443828840de6a88bf" and "40f6bc572e06ecfafefd045a27fb4254f094aae1" have entirely different histories.
6b8692e63a ... 40f6bc572e

2 changed files with 10 additions and 17 deletions
Show Stats Expand all files Collapse all files

9
src/LoggerClient.ts
View File

@ -46,19 +46,16 @@ class LoggerClient implements Logger
const { customTypes = [] } = opts;
this.#types = [ ...customTypes, ...Defaults.Types ];
this.#_logLevelMapping = { ...Defaults.ClientOptions.logLevelMapping, ...opts.logLevelMapping };
this.#_guard = opts.guard || Defaults.ClientOptions.guard as string;
this.#_logLevel = opts.logLevel ?? Defaults.ClientOptions.logLevel as number;
for (const type of this.#types)
{
if (typeof this.#_logLevelMapping[type] === 'undefined')
throw new Error(`Missing logLevelMapping for type ${type}`);
Object.defineProperty(this, type, {
value: (msg: string, o: WriteOptions) => this.#transport(msg, { ...o, type })
});
}
this.#_guard = opts.guard || Defaults.ClientOptions.guard as string;
this.#_logLevel = opts.logLevel ?? Defaults.ClientOptions.logLevel as number;
this.#_logLevelMapping = { ...Defaults.ClientOptions.logLevelMapping, ...opts.logLevelMapping };
}

14
src/MasterLogger.ts
View File

@ -55,6 +55,7 @@ class MasterLogger implements Logger
constructor (config = Defaults.MasterOptions)
{
const {
directory, customTypes = [], customStreams = [], customTypeMapping,
customColours, guard, fileRotationFreq, logLevel, logLevelMapping,
@ -81,8 +82,6 @@ class MasterLogger implements Logger
this.#types = [ ...customTypes, ...Defaults.Types ];
for (const type of this.#types)
{
if (typeof this.#_logLevelMapping[type] === 'undefined')
throw new Error(`Missing logLevelMapping for type ${type}`);
Object.defineProperty(this, type, {
value: (msg: string, opts: WriteOptions) => this.write(type, msg, opts)
});
@ -207,6 +206,8 @@ class MasterLogger implements Logger
write (type = 'info', text: string | object | Error, { subheader = '', shard, broadcast = false }: WriteOptions = {})
{
type = type.toLowerCase();
let colour = this.#colourFuncs[type];
if (!colour)
colour = this.#colourFuncs.info;
@ -222,13 +223,8 @@ class MasterLogger implements Logger
const spacer = ' '.repeat(maxChars - type.length);
if (this.#_logLevelMapping[type] >= this.#_logLevel)
{
const out = `${colour.func(type)}${spacer} ${colour.func(header)}: ${chalk.bold(subheader)}${text}`;
if (type === 'error')
console.error(out); // eslint-disable-line no-console
else
console.log(out); // eslint-disable-line no-console
}
console.log(`${colour.func(type)}${spacer} ${colour.func(header)}: ${chalk.bold(subheader)}${text}`); // eslint-disable-line no-console
if ((broadcast || this.#_broadcastLevel <= this.#_logLevelMapping[type]) && this.#webhook)
{
const description = (subheader.length ? `**${subheader}**\n` : '') + `\`\`\`${text}\`\`\``;