summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-10-12 15:49:09 +0200
committerErik Larkö <erik@mullvad.net>2017-10-12 15:49:09 +0200
commitfa39927850f5147545afe42e2560c0ce094092f6 (patch)
treedec0714a6b96531a660c6b34403de79778d8aef8
parent6b2b8c2f0799ac91b6330aa9d39ea0d92f6c24c1 (diff)
parent09a4272c66bb5455026a6a9627c1f13ef94ba6b0 (diff)
downloadmullvadvpn-fa39927850f5147545afe42e2560c0ce094092f6.tar.xz
mullvadvpn-fa39927850f5147545afe42e2560c0ce094092f6.zip
Merge branch 'version-log'
-rw-r--r--app/main.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/main.js b/app/main.js
index ed9aae149d..5d24239791 100644
--- a/app/main.js
+++ b/app/main.js
@@ -6,6 +6,7 @@ import log from 'electron-log';
import { app, BrowserWindow, ipcMain, Tray, Menu, nativeImage } from 'electron';
import TrayIconManager from './lib/tray-icon-manager';
import ElectronSudo from 'electron-sudo';
+import { version } from '../package.json';
import type { TrayIconType } from './lib/tray-icon-manager';
@@ -24,7 +25,6 @@ const rpcAddressFile = isMacOS || isLinux
let browserWindowReady = false;
-
const appDelegate = {
_window: (null: ?BrowserWindow),
_tray: (null: ?Tray),
@@ -38,6 +38,8 @@ const appDelegate = {
appDelegate._logFileLocation = appDelegate._getLogsDirectory();
appDelegate._initLogging();
+ log.info('Running version', version);
+
appDelegate._startBackend();
app.on('window-all-closed', () => appDelegate.onAllWindowsClosed());