diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-07-06 11:05:39 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-07-06 11:05:39 +0200 |
| commit | 9ffcd12913f093e218996dd06e5e7513f2d12e07 (patch) | |
| tree | 91d580c5c61ab7ef9309e775a55d3ca877d709eb /app | |
| parent | 5989edc7b8941daa1e2bd54fd073e3c599b57c59 (diff) | |
| parent | b909cc501e09ed9ef242d159961a50ecc99eb60b (diff) | |
| download | mullvadvpn-9ffcd12913f093e218996dd06e5e7513f2d12e07.tar.xz mullvadvpn-9ffcd12913f093e218996dd06e5e7513f2d12e07.zip | |
Merge branch 'dont-start-the-backend'
Diffstat (limited to 'app')
| -rw-r--r-- | app/main.js | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/app/main.js b/app/main.js index ca7ecf7c5d..980a678469 100644 --- a/app/main.js +++ b/app/main.js @@ -29,10 +29,6 @@ const appDelegate = { log.transports.file.level = 'info'; } - if (isDevelopment) { - appDelegate._startBackend(); - } - app.on('window-all-closed', () => appDelegate.onAllWindowsClosed()); app.on('ready', () => appDelegate.onReady()); }, @@ -62,24 +58,6 @@ const appDelegate = { app.quit(); }, - _startBackend: () => { - const sudo = require('sudo-prompt'); - const pathToBackend = path.resolve(process.env.MULLVAD_BACKEND || '../talpid_core/target/debug/talpid_daemon'); - log.info('Starting the mullvad backend at', pathToBackend); - - const options = { - name: 'mullvad backend', - }; - - sudo.exec(pathToBackend, options, (err) => { - if (err && err.signal !== 'SIGINT') { - log.info('Backend exited with error', err); - } else { - log.info('Backend exited'); - } - }); - }, - _sendBackendInfo: (window: BrowserWindow) => { const file = './.mullvad_rpc_address'; log.info('reading the ipc connection info from', file); |
