From ff36a0359c4a1e0053ff43c6f0efbe075894612a Mon Sep 17 00:00:00 2001 From: Ruben Pollan 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 --- bitmaskd.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'bitmaskd.go') diff --git a/bitmaskd.go b/bitmaskd.go index b7036a6..ace9ee7 100644 --- a/bitmaskd.go +++ b/bitmaskd.go @@ -17,12 +17,24 @@ package main import ( + "errors" + "log" + "0xacab.org/leap/bitmask-systray/bitmask" bitmaskd "0xacab.org/leap/bitmask-systray/bitmaskd" ) +const ( + notRunning = `Is bitmaskd running? Start bitmask and try again.` +) + func initBitmask() (bitmask.Bitmask, error) { - return bitmaskd.Init() + b, err := bitmaskd.Init() + if err != nil { + log.Printf("An error ocurred starting bitmaskd: %v", err) + err = errors.New(printer.Sprintf(notRunning)) + } + return b, err } func newAutostart(appName string, iconPath string) autostart { -- cgit v1.2.3