From 52048e168668dfb31d9de0e78a83a0fcc9f8be17 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 21 Oct 2020 15:16:54 -0700 Subject: [PATCH] Fixup error flow --- tor/torProvider.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tor/torProvider.go b/tor/torProvider.go index 535858d..b7fd0ff 100644 --- a/tor/torProvider.go +++ b/tor/torProvider.go @@ -310,17 +310,18 @@ func startTor(appDirectory string, bundledTorPath string, controlPort int, authe // if not, try running system tor if checkCmdlineTorVersion("tor") { - t, err := tor.Start(nil, &tor.StartConf{ControlPort: tp.controlPort, UseEmbeddedControlConn: false, DisableEagerAuth: true, EnableNetwork: true, DataDir: dataDir, TorrcFile: path.Join(dataDir, "torrc"), DebugWriter: nil, ProcessCreator: newHideCmd("tor")}) - if err == nil { - tp.t = t - return tp, nil + t, err := tor.Start(nil, &tor.StartConf{ControlPort: tp.controlPort, DisableCookieAuth: true, UseEmbeddedControlConn: false, DisableEagerAuth: true, EnableNetwork: true, DataDir: dataDir, TorrcFile: path.Join(dataDir, "torrc"), DebugWriter: nil, ProcessCreator: newHideCmd("tor")}) + if err != nil { + log.Debugf("Error connecting to self-run system tor: %v\n", err) + return nil, err } - log.Debugf("Error connecting to self-run system tor: %v\n", err) + tp.t = t } else if bundledTorPath != "" && checkCmdlineTorVersion(bundledTorPath) { log.Debugln("attempting using bundled tor '" + bundledTorPath + "'") t, err := tor.Start(nil, &tor.StartConf{ControlPort: tp.controlPort, DisableCookieAuth: true, UseEmbeddedControlConn: false, DisableEagerAuth: true, EnableNetwork: true, DataDir: dataDir, TorrcFile: path.Join(dataDir, "torrc"), ExePath: bundledTorPath, DebugWriter: nil, ProcessCreator: newHideCmd(bundledTorPath)}) if err != nil { log.Debugf("Error running bundled tor %v\n", err) + return nil, err } tp.t = t }