Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: add Dialer option to connect through a proxy #296

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
add notes
221 committed May 8, 2020
commit 7c19a91142da60348b96dfbf78866dfc831c4133
5 changes: 4 additions & 1 deletion config.go
Original file line number Diff line number Diff line change
@@ -98,7 +98,6 @@ type Config struct {
// used to Initialize, Validate
configHandlers []configHandler

Dialer Dialer `opt:"dialer"`
DialTimeout time.Duration `opt:"dial_timeout" default:"1s"`

// Deadlines for network reads and writes
@@ -108,6 +107,10 @@ type Config struct {
// LocalAddr is the local address to use when dialing an nsqd.
// If empty, a local address is automatically chosen.
LocalAddr net.Addr `opt:"local_addr"`
// Dialer affect connection when dialing an nsqd. Overwrite this to connect over proxy.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use:

Dialer will be called to connect to an nsqd when set, e.g. through a proxy

//
// Conflict with options LocalAddr and DialTimeout.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, this does conflict. We should probably error when a dialer and either of those two config fields are set.

Dialer Dialer `opt:"dialer"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to decide how to handle configuration specified for this opt, e.g. for command line utilities in nsqd that use --consumer-opt.

See: https://github.com/nsqio/nsq/blob/master/apps/nsq_to_file/nsq_to_file.go#L131-L135

And an example of how we handle tls_config: https://github.com/nsqio/go-nsq/blob/master/config.go#L388-L475


// Duration between polling lookupd for new producers, and fractional jitter to add to
// the lookupd pool loop. this helps evenly distribute requests even if multiple consumers