paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Derive RUNNING_INSIDE_TORNADO based on sys.argv.

Browse Source 
This allows it to be used at application startup time.

(cherry picked from commit 169daa31a0)
This commit is contained in:
Alex Vandiver
2025-05-02 18:52:33 +00:00
committed by Tim Abbott
parent 18b800fbfc
commit c4d3547ddf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/management/commands/runtornado.py
View File

@@ -12,7 +12,6 @@ from typing_extensions import override
from zerver.lib.management import ZulipBaseCommand from zerver.lib.management import ZulipBaseCommand
settings.RUNNING_INSIDE_TORNADO = True
if settings.PRODUCTION: if settings.PRODUCTION:
settings.SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https") settings.SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")

4
zproject/computed_settings.py
View File

@@ -295,7 +295,9 @@ if not TORNADO_PORTS:
TORNADO_PORTS = get_tornado_ports(config_file) TORNADO_PORTS = get_tornado_ports(config_file)
TORNADO_PROCESSES = len(TORNADO_PORTS) TORNADO_PROCESSES = len(TORNADO_PORTS)
RUNNING_INSIDE_TORNADO = False RUNNING_INSIDE_TORNADO = (
len(sys.argv) > 1 and "manage.py" in sys.argv[0] and sys.argv[1] == "runtornado"
)
SILENCED_SYSTEM_CHECKS = [ SILENCED_SYSTEM_CHECKS = [
# auth.W004 checks that the UserProfile field named by USERNAME_FIELD has # auth.W004 checks that the UserProfile field named by USERNAME_FIELD has