@@ -15,12 +15,17 @@ let enforceSecurity = (auth) => {
15
15
export class LogsRouter extends PromiseRouter {
16
16
17
17
mountRoutes ( ) {
18
- this . route ( 'GET' , '/logs' , ( req ) => {
18
+ this . route ( 'GET' , '/scriptlog' , this . validateRequest , ( req ) => {
19
19
return this . handleGET ( req ) ;
20
20
} ) ;
21
- this . route ( 'GET' , '/scriptlog' , ( req ) => {
22
- return this . handleScriptLog ( req ) ;
23
- } ) ;
21
+ }
22
+
23
+ validateRequest ( req ) {
24
+ if ( ! req . config || ! req . config . loggerController ) {
25
+ throw new Parse . Error ( Parse . Error . PUSH_MISCONFIGURED ,
26
+ 'Logger adapter is not availabe' ) ;
27
+ }
28
+ enforceSecurity ( req . auth ) ;
24
29
}
25
30
26
31
// Returns a promise for a {response} object.
@@ -30,10 +35,15 @@ export class LogsRouter extends PromiseRouter {
30
35
// until (optional) End time for the search. Defaults to current time.
31
36
// order (optional) Direction of results returned, either “asc” or “desc”. Defaults to “desc”.
32
37
// size (optional) Number of rows returned by search. Defaults to 10
38
+ // n same as size, overrides size if set
33
39
handleGET ( req ) {
34
40
const from = req . query . from ;
35
41
const until = req . query . until ;
36
- const size = req . query . size ;
42
+ let size = req . query . size ;
43
+ if ( req . query . n ) {
44
+ size = req . query . n ;
45
+ }
46
+
37
47
const order = req . query . order
38
48
const level = req . query . level ;
39
49
const options = {
@@ -43,21 +53,6 @@ export class LogsRouter extends PromiseRouter {
43
53
order,
44
54
level,
45
55
}
46
- return this . getLogs ( req , options ) ;
47
- }
48
-
49
- handleScriptLog ( req ) {
50
- const size = req . query . n ;
51
- const level = req . query . level ;
52
- return this . getLogs ( req , { size, level } ) ;
53
- }
54
-
55
- getLogs ( req , options ) {
56
- if ( ! req . config || ! req . config . loggerController ) {
57
- throw new Parse . Error ( Parse . Error . PUSH_MISCONFIGURED ,
58
- 'Logger adapter is not availabe' ) ;
59
- }
60
- enforceSecurity ( req . auth ) ;
61
56
return req . config . loggerController . getLogs ( options ) . then ( ( result ) => {
62
57
return Promise . resolve ( {
63
58
response : result
0 commit comments