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

Compare commits

base: Navy.gif:40f6bc572e06ecfafefd045a27fb4254f094aae1
Branches Tags
Navy.gif:master
..
compare: Navy.gif:4c68f237ff7cbf0cf612394ba73ad84fdb2a36f9
Branches Tags
Navy.gif:master

No commits in common. "40f6bc572e06ecfafefd045a27fb4254f094aae1" and "4c68f237ff7cbf0cf612394ba73ad84fdb2a36f9" have entirely different histories.
40f6bc572e ... 4c68f237ff

3 changed files with 9 additions and 19 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@navy.gif/logger", "name": "@navy.gif/logger",
"version": "2.4.3", "version": "2.4.2",
"description": "Logging thing", "description": "Logging thing",
"author": "Navy.gif", "author": "Navy.gif",
"license": "MIT", "license": "MIT",

7
src/Defaults.ts
View File

@ -44,7 +44,6 @@ const customTypes: string[] = [];
const guard = '_logger'; const guard = '_logger';
const webhook: { url?: string, id?: string, token?: string } = {}; const webhook: { url?: string, id?: string, token?: string } = {};
const pruneDays = 3; const pruneDays = 3;
const skipFileWrite = false;
type LogLevelType = { type LogLevelType = {
debug: LogLevel, debug: LogLevel,
@ -84,8 +83,7 @@ export type LoggerMasterOptions = SharedOptionsType & {
customColours?: { [key: string]: number | string }, customColours?: { [key: string]: number | string },
broadcastLevel?: number, broadcastLevel?: number,
webhook?: WebhookClientOptions, webhook?: WebhookClientOptions,
pruneDays?: number, pruneDays?: number
skipFileWrite?: boolean
} }
const MasterOptions: LoggerMasterOptions = { const MasterOptions: LoggerMasterOptions = {
@ -97,8 +95,7 @@ const MasterOptions: LoggerMasterOptions = {
customColours, customColours,
broadcastLevel: 4, broadcastLevel: 4,
webhook, webhook,
pruneDays, pruneDays
skipFileWrite
}; };
export type LoggerClientOptions = SharedOptionsType; export type LoggerClientOptions = SharedOptionsType;

19
src/MasterLogger.ts
View File

@ -51,7 +51,6 @@ class MasterLogger implements Logger
#rotateTO: NodeJS.Timeout; #rotateTO: NodeJS.Timeout;
#pruneInterval: NodeJS.Timer; #pruneInterval: NodeJS.Timer;
#pruneDays: number; #pruneDays: number;
#skipFileWrite: boolean;
constructor (config = Defaults.MasterOptions) constructor (config = Defaults.MasterOptions)
{ {
@ -59,7 +58,7 @@ class MasterLogger implements Logger
const { const {
directory, customTypes = [], customStreams = [], customTypeMapping, directory, customTypes = [], customStreams = [], customTypeMapping,
customColours, guard, fileRotationFreq, logLevel, logLevelMapping, customColours, guard, fileRotationFreq, logLevel, logLevelMapping,
webhook, broadcastLevel, pruneDays, skipFileWrite webhook, broadcastLevel, pruneDays
} = { ...Defaults.MasterOptions, ...config }; } = { ...Defaults.MasterOptions, ...config };
if (!directory) if (!directory)
@ -77,7 +76,6 @@ class MasterLogger implements Logger
addLogLevel(name, level); addLogLevel(name, level);
}); });
this.#_guard = guard as string; this.#_guard = guard as string;
this.#skipFileWrite = skipFileWrite as boolean;
this.#types = [ ...customTypes, ...Defaults.Types ]; this.#types = [ ...customTypes, ...Defaults.Types ];
for (const type of this.#types) for (const type of this.#types)
@ -107,14 +105,11 @@ class MasterLogger implements Logger
this.#streamTypes = [ ...customStreams, 'error', 'default' ]; this.#streamTypes = [ ...customStreams, 'error', 'default' ];
this.#streamTypeMapping = { ...Defaults.TypeStream, ...customTypeMapping }; this.#streamTypeMapping = { ...Defaults.TypeStream, ...customTypeMapping };
if (this.#skipFileWrite) this.#writeStreams = this.#streamTypes.reduce((acc, type) =>
this.#writeStreams = {}; {
else acc[type] = this.loadFile(type);
this.#writeStreams = this.#streamTypes.reduce((acc, type) => return acc;
{ }, {} as WriteStreams);
acc[type] = this.loadFile(type);
return acc;
}, {} as WriteStreams);
// Startup day, used to keep track of file rotation // Startup day, used to keep track of file rotation
this.#rotationFreq = fileRotationFreq as number * DAY; this.#rotationFreq = fileRotationFreq as number * DAY;
@ -237,8 +232,6 @@ class MasterLogger implements Logger
}); });
} }
if (this.#skipFileWrite)
return;
const streamType = this.#streamTypeMapping[type] || 'default'; const streamType = this.#streamTypeMapping[type] || 'default';
if (this.#writeStreams[streamType]) if (this.#writeStreams[streamType])
this.#writeStreams[streamType].write(`\n${type}${spacer} ${header}: ${subheader}${text}`); this.#writeStreams[streamType].write(`\n${type}${spacer} ${header}: ${subheader}${text}`);