From ff36a0359c4a1e0053ff43c6f0efbe075894612a Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Wed, 10 Oct 2018 14:15:55 -0500
Subject: [feat] improve readability of errors

Let's not report 'bitmaskd is not running' in standalone mode.

- Resolves: #35
---
 standalone.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'standalone.go')

diff --git a/standalone.go b/standalone.go
index e2c9f66..ebcc040 100644
--- a/standalone.go
+++ b/standalone.go
@@ -17,6 +17,8 @@
 package main
 
 import (
+	"errors"
+	"log"
 	"os"
 
 	"0xacab.org/leap/bitmask-systray/bitmask"
@@ -24,8 +26,17 @@ import (
 	pmautostart "github.com/ProtonMail/go-autostart"
 )
 
+const (
+	errorMsg = `An error has ocurred initializing %s: %v`
+)
+
 func initBitmask() (bitmask.Bitmask, error) {
-	return standalone.Init()
+	b, err := standalone.Init()
+	if err != nil {
+		log.Printf("An error ocurred starting standalone bitmask: %v", err)
+		err = errors.New(printer.Sprintf(errorMsg, applicationName, err))
+	}
+	return b, err
 }
 
 func newAutostart(appName string, iconPath string) autostart {
-- 
cgit v1.2.3