Skip to content

Conversation

@jwhitlock
Copy link
Member

@jwhitlock jwhitlock commented Jan 24, 2024

This expands on PR #4309 to use dockerflow 2024.1.0

  • Use our privaterelay.utils.get_version_info, which provides caching and a default response when version.json is not present.
  • Enable the Redis check if REDIS_URL is set
  • MPP-1810: Remove the /__version__, /__heartbeat, and /__lbheartbeat__ views, since DockerflowMiddleware handles these before we see them.

How to test:

Load in local development, and try:

  • [ ] l10n changes have been submitted to the l10n repository, if any.
  • I've added a unit test to test for potential regressions of this bug.
  • [ ] I've added or updated relevant docs in the docs/ directory.
  • [ ] All UI revisions follow the coding standards, and use Protocol tokens where applicable (see /frontend/src/styles/tokens.scss).
  • Commits in this PR are minimal and have descriptive commit messages.

dependabot bot and others added 5 commits January 24, 2024 11:36
Bumps [dockerflow](https://github.com/mozilla-services/python-dockerflow) from 2022.8.0 to 2024.1.0.
- [Release notes](https://github.com/mozilla-services/python-dockerflow/releases)
- [Changelog](https://github.com/mozilla-services/python-dockerflow/blob/main/docs/changelog.rst)
- [Commits](mozilla-services/python-dockerflow@2022.8.0...2024.1.0)

---
updated-dependencies:
- dependency-name: dockerflow
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
These paths are handled in DockerflowMiddleware, so the ones in our code
are unused.
@jwhitlock jwhitlock requested a review from groovecoder January 24, 2024 21:38
@pytest.mark.django_db
def test_heartbeat_view(client) -> None:
response = client.get("/__heartbeat__")
assert response.status_code in (200, 500)
Copy link
Member

Choose a reason for hiding this comment

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

question (non-blocking): why is status_code=500 okay here?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's one of the two possible responses... Let's be bold and say it is 200 and see where it fails.

Comment on lines -53 to -54
import silk

Copy link
Member

Choose a reason for hiding this comment

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

praise: nice cleanup.

@jwhitlock jwhitlock enabled auto-merge January 24, 2024 23:12
@jwhitlock jwhitlock added this pull request to the merge queue Jan 24, 2024
Merged via the queue into main with commit fe4488c Jan 24, 2024
@jwhitlock jwhitlock deleted the update-dockerflow-mpp-1810 branch January 24, 2024 23:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants