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

nsqd: update and fix for latest go-options #738

Merged
merged 3 commits into from
Apr 15, 2016

Conversation

mreiferson
Copy link
Member

this is a replacement for #736, thanks @FlamingTree!

@mreiferson
Copy link
Member Author

Actually cleans this up a bunch, RFR @jehiah

ClientTimeout: 60 * time.Second,

MaxHeartbeatInterval: 60 * time.Second,
Copy link
Member

Choose a reason for hiding this comment

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

removing these presents a challenge for those importing nsqd directly though right?

Copy link
Member

Choose a reason for hiding this comment

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

Thinking on this a little more I think it'd be better to preserve the defaults here in NewOptions() and just change the order in main() to get NewOptions() first and pass that in to nsqFlagset(), so that the defaults come from the nsqd package, not apps/nsqd

Copy link
Member Author

Choose a reason for hiding this comment

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

Good points, agreed, will update.

@mreiferson
Copy link
Member Author

updated

@jehiah
Copy link
Member

jehiah commented Apr 15, 2016

@mreiferson can you look into why CI isn't happy yet? (LGTM otherwise)

@mreiferson
Copy link
Member Author

let's see how this run does

@jehiah
Copy link
Member

jehiah commented Apr 15, 2016

👍 LGTM. squash?

@mreiferson
Copy link
Member Author

🔨d

@jehiah jehiah merged commit fa56e2f into nsqio:master Apr 15, 2016
@mreiferson mreiferson deleted the go-options-update branch April 15, 2016 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants