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

@ -359,8 +359,10 @@ func (s *Session) MaybeStartTunnel(ctx context.Context, name string) error {
}
s.logger.Infof("starting '%s' tunnel; please be patient...", name)
tunnel, err := tunnel.Start(ctx, &tunnel.Config{
Name: name,
Session: s,
Name: name,
Session: s,
TorArgs: s.TorArgs(),
TorBinary: s.TorBinary(),
})
if err != nil {
s.logger.Warnf("cannot start tunnel: %+v", err)