@@ -4,20 +4,21 @@ require('events').EventEmitter.prototype._maxListeners = 100;
4
4
5
5
const newrelic = process . env . NEW_RELIC_ENABLED === 'true' ? require ( 'newrelic' ) : undefined ;
6
6
const senecaNR = require ( 'seneca-newrelic' ) ;
7
- var config = require ( './config/config.js' ) ( ) ;
7
+
8
+ const service = 'cp-users-service' ;
9
+ const { logger, log } = require ( 'cp-logs-lib' ) ( {
10
+ name : service ,
11
+ level : process . env . NODE_ENV === 'production' ? 'warn' : 'info'
12
+ } ) ;
13
+ const config = require ( './config/config.js' ) ( { log } ) ;
8
14
var seneca = require ( 'seneca' ) ( config ) ;
9
15
var _ = require ( 'lodash' ) ;
10
16
var store = require ( 'seneca-postgresql-store' ) ;
11
17
var storeQuery = require ( 'seneca-store-query' ) ;
12
- var service = 'cp-users-service' ;
13
- var log = require ( 'cp-logs-lib' ) ( { name : service , level : 'warn' } ) ;
14
- config . log = log . log ;
15
18
var util = require ( 'util' ) ;
16
19
var dgram = require ( 'dgram' ) ;
17
20
18
- if ( process . env . NODE_ENV !== 'production' ) {
19
- seneca . log . info ( 'using config' , JSON . stringify ( config , null , 4 ) ) ;
20
- }
21
+ logger . info ( config , 'config' ) ;
21
22
22
23
seneca . options ( config ) ;
23
24
seneca . decorate ( 'customValidatorLogFormatter' , require ( './lib/custom-validator-log-formatter' ) ) ;
@@ -31,45 +32,39 @@ if (process.env.MAILDEV_ENABLED === 'true') {
31
32
32
33
function shutdown ( err ) {
33
34
if ( err !== undefined ) {
34
- var error = {
35
- date : new Date ( ) . toString ( ) ,
36
- msg : err . stack !== undefined
35
+ logger . error (
36
+ err ,
37
+ err . stack !== undefined
37
38
? 'FATAL: UncaughtException, please report: ' + util . inspect ( err . stack )
38
- : 'FATAL: UncaughtException, no stack trace' ,
39
- err : util . inspect ( err )
40
- } ;
41
- console . error ( JSON . stringify ( error ) ) ;
39
+ : 'FATAL: UncaughtException, no stack trace' ) ;
42
40
process . exit ( 1 ) ;
43
41
}
44
42
process . exit ( 0 ) ;
45
43
}
46
44
47
45
require ( './migrate-psql-db.js' ) ( function ( err ) {
48
- if ( err ) {
49
- console . error ( err ) ;
50
- process . exit ( - 1 ) ;
51
- }
52
- console . log ( 'Migrations ok' ) ;
46
+ if ( err ) shutdown ( err ) ;
47
+ logger . info ( 'Migrations ok' ) ;
53
48
54
49
seneca . use ( require ( './email-notifications.js' ) ) ;
55
50
seneca . use ( require ( './lib/agreements' ) ) ;
56
- seneca . use ( require ( './profiles.js' ) ,
57
- { postgresql : config [ 'postgresql-store' ] ,
58
- logger : log . logger
59
- } ) ;
60
- seneca . use ( require ( './oauth2.js' ) , { clients : config . oauth2 . clients } ) ;
51
+ seneca . use ( require ( './profiles.js' ) , {
52
+ postgresql : config [ 'postgresql-store' ] ,
53
+ logger
54
+ } ) ;
55
+ seneca . use ( require ( './oauth2.js' ) , { clients : config . oauth2 . clients } ) ;
61
56
seneca . use ( 'user' ) ;
62
57
seneca . use ( 'auth' ) ;
63
- seneca . use ( require ( './users.js' ) ,
64
- { 'email-notifications' : config [ 'email-notifications' ] ,
65
- ' postgresql' : config [ 'postgresql-store' ] ,
66
- ' users' : config [ 'users' ] ,
67
- 'logger' : log . logger
68
- } ) ;
69
- seneca . use ( require ( './user-profile.js' ) ,
70
- { postgresql : config [ 'postgresql-store' ] ,
71
- logger : log . logger
72
- } ) ;
58
+ seneca . use ( require ( './users.js' ) , {
59
+ 'email-notifications' : config [ 'email-notifications' ] ,
60
+ postgresql : config [ 'postgresql-store' ] ,
61
+ users : config [ 'users' ] ,
62
+ logger
63
+ } ) ;
64
+ seneca . use ( require ( './user-profile.js' ) , {
65
+ postgresql : config [ 'postgresql-store' ] ,
66
+ logger
67
+ } ) ;
73
68
seneca . use ( require ( './nodebb-api.js' ) , config . nodebb ) ;
74
69
seneca . use ( require ( 'cp-permissions-plugin' ) , {
75
70
config : __dirname + '/config/permissions'
@@ -106,7 +101,11 @@ require('./migrate-psql-db.js')(function (err) {
106
101
seneca . wrap ( 'role: entity, cmd: ' + cmd , function filterFields ( args , cb ) {
107
102
try {
108
103
[ 'limit$' , 'skip$' ] . forEach ( function ( field ) {
109
- if ( args . q [ field ] && args . q [ field ] !== 'NULL' && ! / ^ [ 0 - 9 ] + $ / g. test ( args . q [ field ] + '' ) ) {
104
+ if (
105
+ args . q [ field ] &&
106
+ args . q [ field ] !== 'NULL' &&
107
+ ! / ^ [ 0 - 9 ] + $ / g. test ( args . q [ field ] + '' )
108
+ ) {
110
109
throw new Error ( 'Expect limit$, skip$ to be a number' ) ;
111
110
}
112
111
} ) ;
@@ -124,7 +123,7 @@ require('./migrate-psql-db.js')(function (err) {
124
123
}
125
124
if ( args . q . fields$ ) {
126
125
args . q . fields$ . forEach ( function ( field , index ) {
127
- args . q . fields$ [ index ] = '\ "' + escape ( field ) + '\ "' ;
126
+ args . q . fields$ [ index ] = '"' + escape ( field ) + '"' ;
128
127
} ) ;
129
128
}
130
129
// Loop over each props
0 commit comments