Skip to content

Commit cd24f6d

Browse files
committed
fix: feedbacks
1 parent f75fad7 commit cd24f6d

File tree

7 files changed

+9
-21
lines changed

7 files changed

+9
-21
lines changed

resources/buildConfigDefinitions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const nestedOptionEnvPrefix = {
4040
LogClientEvent: 'PARSE_SERVER_DATABASE_LOG_CLIENT_EVENTS_',
4141
LogLevel: 'PARSE_SERVER_LOG_LEVEL_',
4242
LogLevels: 'PARSE_SERVER_LOG_LEVELS_',
43-
LogEvents: 'PARSE_SERVER_LOG_EVENTS_',
4443
PagesCustomUrlsOptions: 'PARSE_SERVER_PAGES_CUSTOM_URL_',
4544
PagesOptions: 'PARSE_SERVER_PAGES_',
4645
PagesRoute: 'PARSE_SERVER_PAGES_ROUTE_',

src/Config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
FileUploadOptions,
1515
IdempotencyOptions,
1616
LogLevels,
17-
LogEvents,
1817
PagesOptions,
1918
ParseServerOptions,
2019
SchemaOptions,
@@ -645,14 +644,14 @@ export class Config {
645644
}
646645

647646
static validateLogEvents(logEvents) {
648-
for (const key of Object.keys(LogEvents)) {
647+
for (const key of Object.keys(LogLevels)) {
649648
if (logEvents[key]) {
650649
// We validate that each configured event uses a valid log *level* (same list as logLevels).
651650
if (validLogLevels.indexOf(logEvents[key]) === -1) {
652651
throw `'${key}' must be one of ${JSON.stringify(validLogLevels)}`;
653652
}
654653
} else {
655-
logEvents[key] = LogEvents[key].default;
654+
logEvents[key] = LogLevels[key].default;
656655
}
657656
}
658657
}

src/Options/Definitions.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ module.exports.ParseServerOptions = {
356356
env: 'PARSE_SERVER_LOG_EVENTS',
357357
help: '(Optional) Overrides the log levels used by specific log events.',
358358
action: parsers.objectParser,
359-
type: 'LogEvents',
359+
type: 'LogLevels',
360360
default: {},
361361
},
362362
loggerAdapter: {
@@ -1513,10 +1513,8 @@ module.exports.LogLevels = {
15131513
'Log level used by the Cloud Code Triggers `beforeSave`, `beforeDelete`, `beforeFind`, `beforeLogin` on success. Default is `info`. See [LogLevel](LogLevel.html) for available values.',
15141514
default: 'info',
15151515
},
1516-
};
1517-
module.exports.LogEvents = {
15181516
usernameAlreadyExists: {
1519-
env: 'PARSE_SERVER_LOG_EVENTS_USERNAME_ALREADY_EXISTS',
1517+
env: 'PARSE_SERVER_LOG_LEVELS_USERNAME_ALREADY_EXISTS',
15201518
help:
15211519
'Log level used when a sign-up fails because the username already exists. Default is `error`. See [LogLevel](LogLevel.html) for available values.',
15221520
default: 'error',

src/Options/docs.js

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

src/Options/index.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export interface ParseServerOptions {
100100
logLevels: ?LogLevels;
101101
/* (Optional) Overrides the log levels used by specific log events.
102102
:DEFAULT: {} */
103-
logEvents: ?LogEvents;
103+
logEvents: ?LogLevels;
104104
/* 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) */
105105
maxLogFiles: ?NumberOrString;
106106
/* Disables console output
@@ -792,9 +792,6 @@ export interface LogLevels {
792792
:DEFAULT: error
793793
*/
794794
cloudFunctionError: ?string;
795-
}
796-
797-
export interface LogEvents {
798795
/* Log level used when a sign-up fails because the username already exists. Default is `error`. See [LogLevel](LogLevel.html) for available values.
799796
:DEFAULT: error
800797
*/

src/middlewares.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,8 @@ export function handleParseErrors(err, req, res, next) {
466466
if (req.config && req.config.enableExpressErrorHandler) {
467467
return next(err);
468468
}
469-
const usernameAlreadyExistsLevel = req.config?.logEvents?.usernameAlreadyExists || 'error';
469+
const usernameAlreadyExistsLevel =
470+
req.config?.logEvents?.usernameAlreadyExists || 'info';
470471
let httpStatus;
471472
// TODO: fill out this mapping
472473
switch (err.code) {

types/Options/index.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export interface ParseServerOptions {
4747
verbose?: boolean;
4848
logLevel?: string;
4949
logLevels?: LogLevels;
50-
logEvents?: LogEvents;
50+
logEvents?: LogLevels;
5151
maxLogFiles?: NumberOrString;
5252
silent?: boolean;
5353
databaseURI: string;
@@ -298,8 +298,6 @@ export interface LogLevels {
298298
triggerBeforeError?: string;
299299
cloudFunctionSuccess?: string;
300300
cloudFunctionError?: string;
301-
}
302-
export interface LogEvents {
303301
usernameAlreadyExists?: string;
304302
}
305303
export {};

0 commit comments

Comments
 (0)