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

Switch local API dev server to use gunicorn instead of django runserver #2936

Merged

Conversation

ashiramin
Copy link
Contributor

@ashiramin ashiramin commented Aug 31, 2023

Fixes

Fixes #2814 by @sarayourfriend

Description

  • Swapped out manage.py runserver for gunicorn --reload in docker-compose

Testing Instructions

Update api/.env to have ENVIRONMENT=local or recreate api/.env (rm api/.env && cp api/env.template api/.env). Then run just dc stop web && just dc stop nginx && just build web && just api/up and confirm the API responds and static files work (visit /admin and confirm the page has styles). Confirm the Nginx image still has static files by visiting the Nginx service locally at http://0.0.0.0:50270/admin. This proves the static files are still correctly copied over from the Django image.

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@openverse-bot openverse-bot added 🟧 priority: high Stalls work on the project or its dependents 💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users 🧱 stack: api Related to the Django API labels Aug 31, 2023
@ashiramin
Copy link
Contributor Author

@sarayourfriend Kept it in draft state for now. Are there any other changes I need to make?

Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

I think this looks good to me. I haven't tested it locally yet, but will do so today. I think we could leave out the --bind parameter, I expected that to be handled by the gunicorn.conf, but I could be wrong.

@sarayourfriend
Copy link
Collaborator

Okay, everything looks good, just three things, only one of which is significant:

  1. We can remove the --bind option, it is indeed covered by gunicorn.conf.py
  2. We should consider adding -w 1 so that we only run a single worker locally. There's no benefit to running 4 and it just makes the logs more confusing to follow.
  3. Static files are not working because there are additional changes to make it work. The changes required are:

@ashiramin ashiramin marked this pull request as ready for review September 3, 2023 01:22
@ashiramin ashiramin requested a review from a team as a code owner September 3, 2023 01:22
@ashiramin
Copy link
Contributor Author

@sarayourfriend Made the changes you requested and was able to test that static files are not 404ing locally

Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the contribution @ashiramin. I've gone ahead and added testing instructions but in the future please add them once a PR is marked ready for review. It makes it much easier for maintainers to review PRs 🙏

@ashiramin
Copy link
Contributor Author

@sarayourfriend Thank you for doing this and for reminding me about testing instructions. I'll do this next time :)

@openverse-bot
Copy link
Collaborator

Based on the high urgency of this PR, the following reviewers are being gently reminded to review this PR:

@dhruvkb
This reminder is being automatically generated due to the urgency configuration.

Excluding weekend1 days, this PR was ready for review 2 day(s) ago. PRs labelled with high urgency are expected to be reviewed within 2 weekday(s)2.

@ashiramin, if this PR is not ready for a review, please draft it to prevent reviewers from getting further unnecessary pings.

Footnotes

  1. Specifically, Saturday and Sunday.

  2. For the purpose of these reminders we treat Monday - Friday as weekdays. Please note that the operation that generates these reminders runs at midnight UTC on Monday - Friday. This means that depending on your timezone, you may be pinged outside of the expected range.

Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

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

LGTM, sorry I took so long to review it!

@sarayourfriend sarayourfriend merged commit 6408b42 into WordPress:main Sep 6, 2023
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🧰 goal: internal improvement Improvement that benefits maintainers, not users 🟧 priority: high Stalls work on the project or its dependents 🧱 stack: api Related to the Django API
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Switch local API dev server to use gunicorn --reload instead of Django's runserver
4 participants