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

Allow for Redis environment variables #141

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow for Redis environment variables #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@
if WEB_IMAGE_UPLOAD_PATH and not os.path.exists(WEB_IMAGE_UPLOAD_PATH):
os.mkdir(WEB_IMAGE_UPLOAD_PATH)

REDIS_HOST='redis'
REDIS_PORT=6379
REDIS_DB='0'
REDIS_HOST=os.environ('REDIS_HOST', 'redis')
REDIS_PORT=os.environ('REDIS_PORT', '6379')
REDIS_DB=os.environ('REDIS_DB', '0')
Comment on lines +101 to +103
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's make this use the existing code to configure settings by setting environment variables. To do that, you can add these REDIS_HOST, REDIS_PORT and REDIS_DB to the existing loop in

for envvar in ['SMTP_PORT', 'SMTP_USERNAME', 'SMTP_PASSWORD', 
...

And then to set the defaults after the loop, set the defaults if not already set.

if not REDIS_HOST:
    REDIS_HOST='redis'
if not REDIS_PORT:
   ...

The settings module is clumsy at the moment at setting defaults, but sticking to the convention of having environment variables formatted like CANARY_REDIS_HOST and CANARY_REDIS_PORT using existing code, will help us when we refactor this module to make these types of changes easier.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @alanakirby,

Just checking you saw this response. We would like to get this merged in 🤘

Copy link
Author

Choose a reason for hiding this comment

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

Hi Jay! Its been so long since Ive worked on this project actually. Would your suggestion above allow for storage other than redis?

Copy link
Contributor

Choose a reason for hiding this comment

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

@alanakirby, I'm unsure this commit should attempt to do that. The reason I say this is because we use redis specific libraries through the codebase and so the redis python is unlikely to work with other storages. Which storages did you have in mind?


TWILIO_ENABLED=False
TWILIO_FROM_NUMBER=""
Expand Down