@@ -57,53 +57,37 @@ function startInstance(cb) {
57
57
expressApp . start ( config , function ( err ) {
58
58
if ( err ) {
59
59
log . error ( 'Could not start BWS instance' , err ) ;
60
- return cb ( err ) ;
60
+ return ;
61
61
}
62
62
63
63
server . listen ( port ) ;
64
- return cb ( ) ;
65
- } ) ;
66
- } ;
67
-
68
64
69
- var logStart = function ( err ) {
70
- if ( err ) {
71
- log . error ( 'Error:' + err ) ;
65
+ var instanceInfo = cluster . worker ? ' [Instance:' + cluster . worker . id + ']' : '' ;
66
+ log . info ( 'BWS running ' + instanceInfo ) ;
72
67
return ;
73
- }
74
-
75
- if ( cluster . worker )
76
- log . info ( 'BWS Instance ' + cluster . worker . id + ' running' ) ;
77
- else
78
- log . info ( 'BWS running' ) ;
68
+ } ) ;
79
69
} ;
80
70
71
+ if ( config . cluster && cluster . isMaster ) {
81
72
82
- if ( config . cluster ) {
73
+ // Count the machine's CPUs
74
+ var instances = config . clusterInstances || require ( 'os' ) . cpus ( ) . length ;
83
75
84
- if ( cluster . isMaster ) {
76
+ log . info ( 'Starting ' + instances + ' instances' ) ;
85
77
86
- // Count the machine's CPUs
87
- var instances = config . clusterInstances || require ( 'os' ) . cpus ( ) . length ;
88
-
89
- log . info ( 'Starting ' + instances + ' instances on port:' + port ) ;
90
-
91
- // Create a worker for each CPU
92
- for ( var i = 0 ; i < instances ; i += 1 ) {
93
- cluster . fork ( ) ;
94
- }
95
-
96
- // Listen for dying workers
97
- cluster . on ( 'exit' , function ( worker ) {
98
- // Replace the dead worker,
99
- log . error ( 'Worker ' + worker . id + ' died :(' ) ;
100
- cluster . fork ( ) ;
101
- } ) ;
102
- // Code to run if we're in a worker process
103
- } else {
104
- startInstance ( logStart ) ;
78
+ // Create a worker for each CPU
79
+ for ( var i = 0 ; i < instances ; i += 1 ) {
80
+ cluster . fork ( ) ;
105
81
}
82
+
83
+ // Listen for dying workers
84
+ cluster . on ( 'exit' , function ( worker ) {
85
+ // Replace the dead worker,
86
+ log . error ( 'Worker ' + worker . id + ' died :(' ) ;
87
+ cluster . fork ( ) ;
88
+ } ) ;
89
+ // Code to run if we're in a worker process
106
90
} else {
107
- log . info ( 'Starting on port: ' + port ) ;
108
- startInstance ( logStart ) ;
91
+ log . info ( 'Listening on port: ' + port ) ;
92
+ startInstance ( ) ;
109
93
} ;
0 commit comments