Fix unhandled promise rejections at startup
Summary: I like the idea, but these reject by default promises cause the global rejection handler to fire at startup, looking like things are broken. Reviewed By: danielbuechele Differential Revision: D17397614 fbshipit-source-id: 88601d6c65cb79d61efc27c34a4b7f2dd8716d39
This commit is contained in:
committed by
Facebook Github Bot
parent
2fcd0cbcac
commit
ea4b62c458
@@ -41,13 +41,13 @@ declare interface Server {
|
|||||||
|
|
||||||
class Server extends EventEmitter {
|
class Server extends EventEmitter {
|
||||||
connections: Map<string, ClientInfo>;
|
connections: Map<string, ClientInfo>;
|
||||||
secureServer: Promise<RSocketServer<any, any>>;
|
secureServer: Promise<RSocketServer<any, any>> | null;
|
||||||
insecureServer: Promise<RSocketServer<any, any>>;
|
insecureServer: Promise<RSocketServer<any, any>> | null;
|
||||||
certificateProvider: CertificateProvider;
|
certificateProvider: CertificateProvider;
|
||||||
connectionTracker: ConnectionTracker;
|
connectionTracker: ConnectionTracker;
|
||||||
logger: Logger;
|
logger: Logger;
|
||||||
store: Store;
|
store: Store;
|
||||||
initialisePromise: Promise<void>;
|
initialisePromise: Promise<void> | null;
|
||||||
|
|
||||||
constructor(logger: Logger, store: Store) {
|
constructor(logger: Logger, store: Store) {
|
||||||
super();
|
super();
|
||||||
@@ -55,12 +55,9 @@ class Server extends EventEmitter {
|
|||||||
this.connections = new Map();
|
this.connections = new Map();
|
||||||
this.certificateProvider = new CertificateProvider(this, logger);
|
this.certificateProvider = new CertificateProvider(this, logger);
|
||||||
this.connectionTracker = new ConnectionTracker(logger);
|
this.connectionTracker = new ConnectionTracker(logger);
|
||||||
// eslint-disable-next-line prefer-promise-reject-errors
|
this.secureServer = null;
|
||||||
this.secureServer = Promise.reject();
|
this.insecureServer = null;
|
||||||
// eslint-disable-next-line prefer-promise-reject-errors
|
this.initialisePromise = null;
|
||||||
this.insecureServer = Promise.reject();
|
|
||||||
// eslint-disable-next-line prefer-promise-reject-errors
|
|
||||||
this.initialisePromise = Promise.reject();
|
|
||||||
this.store = store;
|
this.store = store;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,7 +277,8 @@ class Server extends EventEmitter {
|
|||||||
if (this.initialisePromise) {
|
if (this.initialisePromise) {
|
||||||
return this.initialisePromise.then(_ => {
|
return this.initialisePromise.then(_ => {
|
||||||
return Promise.all([
|
return Promise.all([
|
||||||
this.secureServer.then(server => server.stop()),
|
this.secureServer && this.secureServer.then(server => server.stop()),
|
||||||
|
this.insecureServer &&
|
||||||
this.insecureServer.then(server => server.stop()),
|
this.insecureServer.then(server => server.stop()),
|
||||||
]).then(() => undefined);
|
]).then(() => undefined);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user