@@ -110,7 +110,7 @@ export class WebServer {
110110 }
111111
112112 try {
113- Logger . instanse . debug ( "WebServer.configure::begin" ) ;
113+ Logger . instanse . silly ( "WebServer.configure::begin" ) ;
114114 let server : http . Server = null ;
115115 if ( this . app === null ) {
116116 this . app = express ( ) ;
@@ -123,13 +123,13 @@ export class WebServer {
123123 const name = Config . getEnv ( "nodered_id" , null ) ;
124124 if ( ! NoderedUtil . IsNullEmpty ( name ) ) defaultLabels [ "name" ] = name ;
125125 if ( NoderedUtil . IsNullEmpty ( name ) ) defaultLabels [ "name" ] = hostname ;
126- Logger . instanse . debug ( "WebServer.configure::configure register" ) ;
126+ Logger . instanse . silly ( "WebServer.configure::configure register" ) ;
127127 const loggerstream = {
128128 write : function ( message , encoding ) {
129129 Logger . instanse . silly ( message ) ;
130130 }
131131 } ;
132- Logger . instanse . debug ( "WebServer.configure::setup express middleware" ) ;
132+ Logger . instanse . silly ( "WebServer.configure::setup express middleware" ) ;
133133 this . app . use ( morgan ( 'combined' , { stream : loggerstream } ) ) ;
134134 this . app . use ( compression ( ) ) ;
135135 this . app . use ( express . urlencoded ( { limit : '10mb' , extended : true } ) )
@@ -149,7 +149,7 @@ export class WebServer {
149149 done ( null , user ) ;
150150 } ) ;
151151 if ( Config . tls_crt != '' && Config . tls_key != '' ) {
152- Logger . instanse . debug ( "WebServer.configure::configure ssl" ) ;
152+ Logger . instanse . silly ( "WebServer.configure::configure ssl" ) ;
153153 let options : any = {
154154 cert : Config . tls_crt ,
155155 key : Config . tls_key
@@ -173,7 +173,7 @@ export class WebServer {
173173 if ( Config . tls_passphrase !== "" ) {
174174 options . passphrase = Config . tls_passphrase ;
175175 }
176- Logger . instanse . debug ( "WebServer.configure::create https server" ) ;
176+ Logger . instanse . silly ( "WebServer.configure::create https server" ) ;
177177 server = https . createServer ( options , this . app ) ;
178178
179179 const redirapp = express ( ) ;
@@ -185,14 +185,14 @@ export class WebServer {
185185 } )
186186 // _http.listen(80);
187187 } else {
188- Logger . instanse . debug ( "WebServer.configure::create http server" ) ;
188+ Logger . instanse . silly ( "WebServer.configure::create http server" ) ;
189189 server = http . createServer ( this . app ) ;
190190 }
191191 server . on ( "error" , ( error ) => {
192192 Logger . instanse . error ( error ) ;
193193 } ) ;
194194
195- Logger . instanse . debug ( "WebServer.configure::configure nodered settings" ) ;
195+ Logger . instanse . silly ( "WebServer.configure::configure nodered settings" ) ;
196196 this . settings = new nodered_settings ( ) ;
197197 this . settings . functionExternalModules = Config . function_external_modules ;
198198 this . settings . editorTheme . codeEditor . lib = Config . codeeditor_lib ;
@@ -322,7 +322,7 @@ export class WebServer {
322322 noderedcontribmiddlewareauth . process ( socket , req , res , next ) ;
323323 } ;
324324
325- Logger . instanse . debug ( "WebServer.configure::configure nodered storageModule" ) ;
325+ Logger . instanse . silly ( "WebServer.configure::configure nodered storageModule" ) ;
326326 this . settings . storageModule = new noderedcontribopenflowstorage ( socket ) ;
327327 const n : noderednpmrc = await this . settings . storageModule . _getnpmrc ( ) ;
328328 if ( ! NoderedUtil . IsNullUndefinded ( n ) && ! NoderedUtil . IsNullUndefinded ( n . catalogues ) ) {
@@ -398,7 +398,14 @@ export class WebServer {
398398 Logger . instanse . debug ( "WebServer.configure::server.listen on port " + Config . port ) ;
399399 server . listen ( Config . port ) . on ( 'error' , function ( error ) {
400400 Logger . instanse . error ( error ) ;
401- process . exit ( 404 ) ;
401+ if ( Config . NODE_ENV == "production" ) {
402+ try {
403+ server . close ( ) ;
404+ } catch ( error ) {
405+ }
406+ process . exit ( 404 ) ;
407+ }
408+
402409 } ) ;
403410 }
404411
@@ -417,7 +424,7 @@ export class WebServer {
417424 let hasErrors : boolean = true , errorCounter : number = 0 , err : any ;
418425 while ( hasErrors ) {
419426 try {
420- Logger . instanse . debug ( "WebServer.configure::restarting nodered ..." ) ;
427+ if ( errorCounter > 0 ) Logger . instanse . warn ( "WebServer.configure::restarting nodered ..." ) ;
421428 RED . start ( ) ;
422429 hasErrors = false ;
423430 } catch ( error ) {
@@ -436,8 +443,9 @@ export class WebServer {
436443 return server ;
437444 } catch ( error ) {
438445 Logger . instanse . error ( error ) ;
439- Logger . instanse . error ( "WEBSERVER ERROR" ) ;
440- // process.exit(404);
446+ if ( Config . NODE_ENV == "production" ) {
447+ process . exit ( 404 ) ;
448+ }
441449 }
442450 return null ;
443451 }
0 commit comments