Better channel restoration for local dev with content proxying #5046
+1,330
−1,392
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bjester
changed the title
bjester
changed the title
bjester
force-pushed
the
easy-channel-restoration
branch
from
8de0abb to
586f089
Compare
bjester
force-pushed
the
easy-channel-restoration
branch
from
f7d9fe4 to
16638f6
Compare
akolson
reviewed
May 9, 2025
| ) | ||
| parser.add_argument( | ||
| "--source-url", | ||
| default="http://localhost:8080", |
There was a problem hiding this comment.
port 8080 here is the nginx port?
There was a problem hiding this comment.
Yes it is. The default functionality before my changes had this command attempt to load from the local instance, so I kept that, but having this be the nginx route means that the logic for fetching the channel's SQLite database can be the same as non-local (production)
akolson
reviewed
May 9, 2025
| action="store_true", | ||
| default=False, | ||
| help="Whether to download content files", | ||
| ) |
There was a problem hiding this comment.
We surely needed this. Thanks for adding it ❤️
|
TODO changes:
|
rtibbles
reviewed
May 19, 2025
| function _on_interrupt() { $(DOCKER_COMPOSE) stop studio-nginx; }; \ | ||
| trap _on_interrupt SIGINT SIGTERM SIGKILL ERR; \ | ||
| $(DOCKER_COMPOSE) up -d studio-nginx; \ | ||
| $(MAKE) -j 2 devrun-django devrun-webpack |
There was a problem hiding this comment.
Maybe add an echo here to tell the actual URL to access on, to make sure people ignore the logging from the django runserver?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
restore_channelmanagement command to be more robust and useful for restoring channels for local development:package.jsontoMakefilemakeand to handle always runningnginxin front of the devserverReferences
Needs for building on search recommendations
Reviewer guidance
python contentcuration/manage.py restore_channel --editor [email protected] --source-url https://studio.learningequality.org --public --publish --token <your_studio_token> <channel_id>(the following is a small channel: d0ef6f71e4fe4e54bb87d7dab5eeaae2)make devrun-servicesthenmake devrun-serverNotes
I simply deleted the existing tests for the channel restoration. Since it's a development only command, the tests usefulness are questionable, but I'm willing to add tests later if it's desired.