summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-07-18 10:29:45 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-07-18 10:29:45 +0200
commitb87a3f546dda526fbc0fea00de7e4d136af92739 (patch)
treea2873c26d47c7d98d8d627c46bb53203055cea47
parent6b35eada9b7d4227823d00555e000b4a1be5257c (diff)
parent347d8d6c9dc7bbdcdecd982cf3ae9228082ab6e7 (diff)
downloadmullvadvpn-b87a3f546dda526fbc0fea00de7e4d136af92739.tar.xz
mullvadvpn-b87a3f546dda526fbc0fea00de7e4d136af92739.zip
Merge branch 'connect-tunnel-on-startup'
-rw-r--r--app/app.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/app.js b/app/app.js
index 6dc4acce58..f22b66029b 100644
--- a/app/app.js
+++ b/app/app.js
@@ -419,6 +419,17 @@ export default class AppRenderer {
} catch (error) {
log.error(`Cannot fetch initial state: ${error.message}`);
}
+
+ // auto connect the tunnel on startup
+ // note: disabled when developing
+ if (process.env.NODE_ENV !== 'development') {
+ try {
+ log.debug('Auto-connecting the tunnel...');
+ await this.connectTunnel();
+ } catch (error) {
+ log.error(`Failed to auto-connect the tunnel: ${error.message}`);
+ }
+ }
}
async _onCloseConnection(error: ?Error) {