Skip to content

Commit 5087a15

Browse files
committed
fix: feedbacks
1 parent 4526b0a commit 5087a15

File tree

7 files changed

+3
-30
lines changed

7 files changed

+3
-30
lines changed

spec/ParseUser.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('Parse.User testing', () => {
8282
});
8383

8484
it('logs username taken with configured log level', async () => {
85-
await reconfigureServer({ logEvents: { usernameAlreadyExists: 'warn' } });
85+
await reconfigureServer({ logLevels: { usernameAlreadyExists: 'warn' } });
8686
const logger = require('../lib/logger').default;
8787
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
8888
const loggerWarnSpy = spyOn(logger, 'warn').and.callThrough();
@@ -110,7 +110,7 @@ describe('Parse.User testing', () => {
110110
});
111111

112112
it('can silence username taken log event', async () => {
113-
await reconfigureServer({ logEvents: { usernameAlreadyExists: 'silent' } });
113+
await reconfigureServer({ logLevels: { usernameAlreadyExists: 'silent' } });
114114
const logger = require('../lib/logger').default;
115115
loggerErrorSpy = spyOn(logger, 'error').and.callThrough();
116116
const loggerWarnSpy = spyOn(logger, 'warn').and.callThrough();

src/Config.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ export class Config {
128128
requestKeywordDenylist,
129129
allowExpiredAuthDataToken,
130130
logLevels,
131-
logEvents,
132131
rateLimit,
133132
databaseOptions,
134133
extendSessionOnUse,
@@ -171,7 +170,6 @@ export class Config {
171170
this.validateRequestKeywordDenylist(requestKeywordDenylist);
172171
this.validateRateLimit(rateLimit);
173172
this.validateLogLevels(logLevels);
174-
this.validateLogEvents(logEvents);
175173
this.validateDatabaseOptions(databaseOptions);
176174
this.validateCustomPages(customPages);
177175
this.validateAllowClientClassCreation(allowClientClassCreation);
@@ -643,19 +641,6 @@ export class Config {
643641
}
644642
}
645643

646-
static validateLogEvents(logEvents) {
647-
for (const key of Object.keys(LogLevels)) {
648-
if (logEvents[key]) {
649-
// We validate that each configured event uses a valid log *level* (same list as logLevels).
650-
if (validLogLevels.indexOf(logEvents[key]) === -1) {
651-
throw `'${key}' must be one of ${JSON.stringify(validLogLevels)}`;
652-
}
653-
} else {
654-
logEvents[key] = LogLevels[key].default;
655-
}
656-
}
657-
}
658-
659644
static validateDatabaseOptions(databaseOptions) {
660645
if (databaseOptions == undefined) {
661646
return;

src/Options/Definitions.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,6 @@ module.exports.ParseServerOptions = {
352352
action: parsers.objectParser,
353353
type: 'LiveQueryServerOptions',
354354
},
355-
logEvents: {
356-
env: 'PARSE_SERVER_LOG_EVENTS',
357-
help: '(Optional) Overrides the log levels used by specific log events.',
358-
action: parsers.objectParser,
359-
type: 'LogLevels',
360-
default: {},
361-
},
362355
loggerAdapter: {
363356
env: 'PARSE_SERVER_LOGGER_ADAPTER',
364357
help: 'Adapter module for the logging sub-system',

src/Options/docs.js

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

src/Options/index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ export interface ParseServerOptions {
9898
/* (Optional) Overrides the log levels used internally by Parse Server to log events.
9999
:DEFAULT: {} */
100100
logLevels: ?LogLevels;
101-
/* (Optional) Overrides the log levels used by specific log events.
102-
:DEFAULT: {} */
103-
logEvents: ?LogLevels;
104101
/* Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null) */
105102
maxLogFiles: ?NumberOrString;
106103
/* Disables console output

src/middlewares.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ export function handleParseErrors(err, req, res, next) {
467467
return next(err);
468468
}
469469
const usernameAlreadyExistsLevel =
470-
req.config?.logEvents?.usernameAlreadyExists || 'info';
470+
req.config?.logLevels?.usernameAlreadyExists || 'info';
471471
let httpStatus;
472472
// TODO: fill out this mapping
473473
switch (err.code) {

types/Options/index.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export interface ParseServerOptions {
4747
verbose?: boolean;
4848
logLevel?: string;
4949
logLevels?: LogLevels;
50-
logEvents?: LogLevels;
5150
maxLogFiles?: NumberOrString;
5251
silent?: boolean;
5352
databaseURI: string;

0 commit comments

Comments
 (0)