@@ -4,20 +4,20 @@ require('events').EventEmitter.prototype._maxListeners = 100;
4
4
5
5
if ( process . env . NEW_RELIC_ENABLED === 'true' ) require ( 'newrelic' ) ;
6
6
7
- var config = require ( './config/config.js' ) ( ) ;
7
+ const service = 'cp-users-service' ;
8
+ const { logger, log } = require ( 'cp-logs-lib' ) ( {
9
+ name : service ,
10
+ level : process . env . NODE_ENV === 'production' ? 'warn' : 'info' ,
11
+ } ) ;
12
+ const config = require ( './config/config.js' ) ( { log } ) ;
8
13
var seneca = require ( 'seneca' ) ( config ) ;
9
14
var _ = require ( 'lodash' ) ;
10
15
var store = require ( 'seneca-postgresql-store' ) ;
11
16
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
17
var util = require ( 'util' ) ;
16
18
var dgram = require ( 'dgram' ) ;
17
19
18
- if ( process . env . NODE_ENV !== 'production' ) {
19
- seneca . log . info ( 'using config' , JSON . stringify ( config , null , 4 ) ) ;
20
- }
20
+ logger . info ( config , 'config' ) ;
21
21
22
22
seneca . options ( config ) ;
23
23
seneca . decorate ( 'customValidatorLogFormatter' , require ( './lib/custom-validator-log-formatter' ) ) ;
@@ -31,45 +31,39 @@ if (process.env.MAILTRAP_ENABLED === 'true') {
31
31
32
32
function shutdown ( err ) {
33
33
if ( err !== undefined ) {
34
- var error = {
35
- date : new Date ( ) . toString ( ) ,
36
- msg : err . stack !== undefined
34
+ logger . error (
35
+ err ,
36
+ err . stack !== undefined
37
37
? '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 ) ) ;
38
+ : 'FATAL: UncaughtException, no stack trace' ) ;
42
39
process . exit ( 1 ) ;
43
40
}
44
41
process . exit ( 0 ) ;
45
42
}
46
43
47
44
require ( './migrate-psql-db.js' ) ( function ( err ) {
48
- if ( err ) {
49
- console . error ( err ) ;
50
- process . exit ( - 1 ) ;
51
- }
52
- console . log ( 'Migrations ok' ) ;
45
+ if ( err ) shutdown ( err ) ;
46
+ logger . info ( 'Migrations ok' ) ;
53
47
54
48
seneca . use ( require ( './email-notifications.js' ) ) ;
55
49
seneca . use ( require ( './agreements.js' ) ) ;
56
- seneca . use ( require ( './profiles.js' ) ,
57
- { postgresql : config [ 'postgresql-store' ] ,
58
- logger : log . logger
59
- } ) ;
50
+ seneca . use ( require ( './profiles.js' ) , {
51
+ postgresql : config [ 'postgresql-store' ] ,
52
+ logger,
53
+ } ) ;
60
54
seneca . use ( require ( './oauth2.js' ) , { clients : config . oauth2 . clients } ) ;
61
55
seneca . use ( 'user' ) ;
62
56
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
- } ) ;
57
+ seneca . use ( require ( './users.js' ) , {
58
+ 'email-notifications' : config [ 'email-notifications' ] ,
59
+ postgresql : config [ 'postgresql-store' ] ,
60
+ users : config [ 'users' ] ,
61
+ logger,
62
+ } ) ;
63
+ seneca . use ( require ( './user-profile.js' ) , {
64
+ postgresql : config [ 'postgresql-store' ] ,
65
+ logger,
66
+ } ) ;
73
67
seneca . use ( require ( './nodebb-api.js' ) , config . nodebb ) ;
74
68
seneca . use ( require ( 'cp-permissions-plugin' ) , {
75
69
config : __dirname + '/config/permissions'
0 commit comments