Skip to content

Commit 37e1097

Browse files
committed
Adds support for --verbose and verbose option when running ParseServer
1 parent 325d09c commit 37e1097

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

src/ParseServer.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import { UserController } from './Controllers/UserController';
4848
import { UsersRouter } from './Routers/UsersRouter';
4949

5050
import ParsePushAdapter from 'parse-server-push-adapter';
51+
5152
// Mutate the Parse object to add the Cloud Code handlers
5253
addParseCloud();
5354

@@ -115,6 +116,7 @@ class ParseServer {
115116
},
116117
liveQuery = {},
117118
sessionLength = 31536000, // 1 Year in seconds
119+
verbose = false,
118120
}) {
119121
// Initialize the node client SDK automatically
120122
Parse.initialize(appId, javascriptKey || 'unused', masterKey);
@@ -149,6 +151,9 @@ class ParseServer {
149151
}
150152
}
151153

154+
if (verbose || process.env.VERBOSE || process.env.VERBOSE_PARSE_SERVER) {
155+
configureLogger({level: 'silly'});
156+
}
152157

153158
const filesControllerAdapter = loadAdapter(filesAdapter, () => {
154159
return new GridStoreAdapter(databaseURI);

src/Routers/LogsRouter.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { Parse } from 'parse/node';
22
import PromiseRouter from '../PromiseRouter';
33
import * as middleware from "../middlewares";
4+
import winston from 'winston';
5+
import { logger, configureLogger } from '../logger';
46

57
export class LogsRouter extends PromiseRouter {
6-
8+
79
mountRoutes() {
810
this.route('GET','/scriptlog', middleware.promiseEnforceMasterKeyAccess, this.validateRequest, (req) => {
911
return this.handleGET(req);
@@ -30,9 +32,9 @@ export class LogsRouter extends PromiseRouter {
3032
const until = req.query.until;
3133
let size = req.query.size;
3234
if (req.query.n) {
33-
size = req.query.n;
35+
size = req.query.n;
3436
}
35-
37+
3638
const order = req.query.order
3739
const level = req.query.level;
3840
const options = {

src/cli/cli-definitions.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,9 @@ export default {
170170
env: "PARSE_SERVER_SESSION_LENGTH",
171171
help: "Session duration, defaults to 1 year",
172172
action: numberParser("sessionLength")
173+
},
174+
"verbose": {
175+
env: "VERBOSE",
176+
help: "Set the logging to verbose"
173177
}
174178
};

src/index.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ import S3Adapter from 'parse-server-s3-adapter'
44
import FileSystemAdapter from 'parse-server-fs-adapter'
55
import { useExternal } from './deprecated'
66

7-
if (process.env.VERBOSE || process.env.VERBOSE_PARSE_SERVER) {
8-
winston.level = 'silly';
9-
}
10-
11-
if (process.env.DEBUG || process.env.DEBUG_PARSE_SERVER) {
12-
winston.level = 'debug';
13-
}
14-
157
// Factory function
168
let _ParseServer = function(options) {
179
let server = new ParseServer(options);

src/logger.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
1111

1212
let currentLogsFolder = LOGS_FOLDER;
1313

14-
function generateTransports() {
15-
let level = process.env.VERBOSE ? 'verbose': 'info';
14+
function generateTransports(level) {
1615
let transports = [
1716
new (DailyRotateFile)({
1817
filename: 'parse-server.info',
@@ -38,7 +37,8 @@ function generateTransports() {
3837

3938
const logger = new winston.Logger();
4039

41-
export function configureLogger({logsFolder}) {
40+
export function configureLogger({logsFolder, level = winston.level}) {
41+
winston.level = level;
4242
logsFolder = logsFolder || currentLogsFolder;
4343

4444
if (!path.isAbsolute(logsFolder)) {
@@ -50,15 +50,14 @@ export function configureLogger({logsFolder}) {
5050
currentLogsFolder = logsFolder;
5151

5252
logger.configure({
53-
transports: generateTransports()
53+
transports: generateTransports(level)
5454
})
5555
}
5656

5757
configureLogger({logsFolder: LOGS_FOLDER});
5858

5959
export function addGroup(groupName) {
60-
let level = process.env.VERBOSE ? 'verbose': 'info';
61-
60+
let level = winston.level;
6261
let transports = generateTransports().concat(new (DailyRotateFile)({
6362
filename: groupName,
6463
dirname: currentLogsFolder,

0 commit comments

Comments
 (0)