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.

Sign up for GitHub

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

Jump to bottom

Fix #87: pick up IP in US for heartbeat #88

Merged
merged 5 commits into from Nov 13, 2019
Merged

Fix #87: pick up IP in US for heartbeat #88

merged 5 commits into from Nov 13, 2019

Conversation

leplatrem
Copy link
Contributor

...I don't know if that's the most sustainable way of fixing #87

@leplatrem
Copy link
Contributor Author

The fix for the lint issue lives in #85

@mythmon
Copy link
Contributor

mythmon commented Nov 7, 2019

Over in mozilla/normandy#2044 I made the check assert that any country was returned. In the Python version IPs that aren't in the DB either throw an error or return None. What do you think about using a similar idea here? I don't feel strongly about either way.

@mythmon mythmon mentioned this pull request Nov 7, 2019
Merged
mythmon
mythmon approved these changes Nov 12, 2019
View reviewed changes
Copy link
Contributor

@mythmon mythmon left a comment

Choose a reason for hiding this comment

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

Thanks for the update. I didn't think to check the length of the returned country in my Normandy version, that's a good improvement. Besides Clippy's grumpiness, I think this is ready to go.

src/endpoints/dockerflow.rs Outdated Show resolved Hide resolved
leplatrem and others added 2 commits November 13, 2019 11:10
@leplatrem @mythmon
Use !.is_empty()
0325d05 
Co-Authored-By: Michael Cooper <mythmon@gmail.com>
@leplatrem
Merge remote-tracking branch 'origin/master' into 87-fix-heartbeat-du…
56c72b6 
…mmy-ip
@leplatrem leplatrem mentioned this pull request Nov 13, 2019
Merged
@mythmon
Copy link
Contributor

mythmon commented Nov 13, 2019

bors r+

bors bot added a commit that referenced this pull request Nov 13, 2019
@bors @leplatrem
Merge #88
0ca59e1 
88: Fix #87: pick up IP in US for heartbeat r=mythmon a=leplatrem

...I don't know if that's the most sustainable way of fixing #87

Co-authored-by: Mathieu Leplatre <mathieu@mozilla.com>
@mythmon
Copy link
Contributor

mythmon commented Nov 13, 2019

This should work now

bors r+

bors bot added a commit that referenced this pull request Nov 13, 2019
@bors @leplatrem
Merge #88
9bce469 
88: Fix #87: pick up IP in US for heartbeat r=mythmon a=leplatrem

...I don't know if that's the most sustainable way of fixing #87

Co-authored-by: Mathieu Leplatre <mathieu@mozilla.com>
@bors
Copy link
Contributor

bors bot commented Nov 13, 2019

Build succeeded

@bors bors bot merged commit bd09da1 into master Nov 13, 2019
@bors bors bot deleted the 87-fix-heartbeat-dummy-ip branch November 13, 2019 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mythmon mythmon mythmon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@leplatrem @mythmon