forked from openprivacy/connectivity
Fixup error flow
This commit is contained in:
parent
34171843fa
commit
52048e1686
|
@ -310,17 +310,18 @@ func startTor(appDirectory string, bundledTorPath string, controlPort int, authe
|
||||||
|
|
||||||
// if not, try running system tor
|
// if not, try running system tor
|
||||||
if checkCmdlineTorVersion("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")})
|
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 {
|
if err != nil {
|
||||||
tp.t = t
|
log.Debugf("Error connecting to self-run system tor: %v\n", err)
|
||||||
return tp, nil
|
return nil, err
|
||||||
}
|
}
|
||||||
log.Debugf("Error connecting to self-run system tor: %v\n", err)
|
tp.t = t
|
||||||
} else if bundledTorPath != "" && checkCmdlineTorVersion(bundledTorPath) {
|
} else if bundledTorPath != "" && checkCmdlineTorVersion(bundledTorPath) {
|
||||||
log.Debugln("attempting using bundled tor '" + 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)})
|
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 {
|
if err != nil {
|
||||||
log.Debugf("Error running bundled tor %v\n", err)
|
log.Debugf("Error running bundled tor %v\n", err)
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
tp.t = t
|
tp.t = t
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue