diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2017-11-30 17:39:04 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2017-12-06 13:36:25 +0100 |
| commit | 49182dcc579235d4c45fdad2405b45993063adc8 (patch) | |
| tree | 3de599db89d3c0d62bac042cf28f9b98b8942add | |
| parent | 345250b46fad88ee9eb77b32a48b60f9590b5b52 (diff) | |
| download | mullvadvpn-49182dcc579235d4c45fdad2405b45993063adc8.tar.xz mullvadvpn-49182dcc579235d4c45fdad2405b45993063adc8.zip | |
Convert Backend.connect() to async
| -rw-r--r-- | app/lib/backend.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/lib/backend.js b/app/lib/backend.js index bc357ab36a..e5b7409d12 100644 --- a/app/lib/backend.js +++ b/app/lib/backend.js @@ -273,14 +273,16 @@ export class Backend { } } - connect(): Promise<void> { - this._store.dispatch(connectionActions.connecting()); - return this._ensureAuthenticated() - .then(() => this._ipc.connect()) - .catch((e) => { - log.error('Backend.connect failed because: ', e.message); - this._store.dispatch(connectionActions.disconnected()); - }); + async connect(): Promise<void> { + try { + this._store.dispatch(connectionActions.connecting()); + + await this._ensureAuthenticated(); + await this._ipc.connect(); + } catch (e) { + log.error('Failed to connect: ', e.message); + this._store.dispatch(connectionActions.disconnected()); + } } disconnect(): Promise<void> { |