@@ -154,28 +154,58 @@ if (EXPORT_DOCS) {
154
154
} else if ( GENERATE_TYPES ) {
155
155
console . log ( await getTypeOutput ( ) )
156
156
} else {
157
- const closeListeners = closeWithGrace ( async ( { err } ) => {
157
+ const closeListeners = closeWithGrace ( async ( { err, signal , manual } ) => {
158
158
if ( err ) {
159
- app . log . error ( err )
159
+ app . log . error ( { err } , 'server closing with error' )
160
+ } else {
161
+ app . log . error (
162
+ { err : new Error ( 'Signal Received' ) } ,
163
+ `${ signal } signal received, server closing, close manual received: ${ manual } `
164
+ )
165
+ }
166
+ try {
167
+ await app . close ( )
168
+ } catch ( err ) {
169
+ app . log . error ( { err } , `Failed to close app` )
170
+ throw err
171
+ }
172
+ try {
173
+ await adminApp . close ( )
174
+ } catch ( err ) {
175
+ app . log . error ( { err } , `Failed to close adminApp` )
176
+ throw err
160
177
}
161
- await app . close ( )
162
- await adminApp . close ( )
163
178
} )
164
179
app . addHook ( 'onClose' , async ( ) => {
165
- closeListeners . uninstall ( )
166
- await adminApp . close ( )
180
+ try {
181
+ closeListeners . uninstall ( )
182
+ await adminApp . close ( )
183
+ } catch ( err ) {
184
+ app . log . error ( { err } , `Failed to close adminApp in app onClose hook` )
185
+ throw err
186
+ }
167
187
} )
168
188
adminApp . addHook ( 'onClose' , async ( ) => {
169
- closeListeners . uninstall ( )
170
- await app . close ( )
189
+ try {
190
+ closeListeners . uninstall ( )
191
+ await app . close ( )
192
+ } catch ( err ) {
193
+ app . log . error ( { err } , `Failed to close app in adminApp onClose hook` )
194
+ throw err
195
+ }
171
196
} )
172
197
173
198
app . listen ( { port : PG_META_PORT , host : PG_META_HOST } , ( err ) => {
174
199
if ( err ) {
175
- app . log . error ( err )
200
+ app . log . error ( { err } , 'Uncaught error in app, exit(1)' )
176
201
process . exit ( 1 )
177
202
}
178
203
const adminPort = PG_META_PORT + 1
179
- adminApp . listen ( { port : adminPort , host : PG_META_HOST } )
204
+ adminApp . listen ( { port : adminPort , host : PG_META_HOST } , ( err ) => {
205
+ if ( err ) {
206
+ app . log . error ( { err } , 'Uncaught error in adminApp, exit(1)' )
207
+ process . exit ( 1 )
208
+ }
209
+ } )
180
210
} )
181
211
}
0 commit comments