refactor(tunnel): provide TorArgs and TorBinary directly (#293)

We're trying to remove a circular dependency between the measurement
Session and the tunnel package. To this end, continue to reduce the
dependency scope by providing TorArgs and TorBinary directly.

Part of https://github.com/ooni/probe/issues/985
This commit is contained in:
Simone Basso 2021-04-04 12:08:13 +02:00 committed by GitHub
commit 47aa773731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 9 deletions

View file

@ -60,7 +60,7 @@ func torStart(ctx context.Context, config *Config) (Tunnel, error) {
default:
}
logfile := LogFile(config.Session)
extraArgs := append([]string{}, config.Session.TorArgs()...)
extraArgs := append([]string{}, config.TorArgs...)
extraArgs = append(extraArgs, "Log")
extraArgs = append(extraArgs, "notice stderr")
extraArgs = append(extraArgs, "Log")
@ -68,7 +68,7 @@ func torStart(ctx context.Context, config *Config) (Tunnel, error) {
instance, err := config.torStart(ctx, &tor.StartConf{
DataDir: path.Join(config.Session.TempDir(), "tor"),
ExtraArgs: extraArgs,
ExePath: config.Session.TorBinary(),
ExePath: config.TorBinary,
NoHush: true,
})
if err != nil {