Skip to content
Snippets Groups Projects
Unverified Commit fdeea852 authored by Fredrik Jonsson's avatar Fredrik Jonsson Committed by GitHub
Browse files

Implement RUNSERVERPLUS_SERVER_ADDRESS_PORT and add console logging for...

Implement RUNSERVERPLUS_SERVER_ADDRESS_PORT and add console logging for werkzeug/runserver_plus (#4309)
parent 0846f657
No related branches found
No related tags found
1 merge request!110v5.23.0 upstream merge!
DJANGO_ADDRESS = $(or $(DJANGO_SERVE_ADDRESS), 127.0.0.1)
DJANGO_PORT = 9001
DJANGO_SETTINGS_MODULE = hypha.settings.dev DJANGO_SETTINGS_MODULE = hypha.settings.dev
JS_VENDOR_DIR = ./hypha/static_src/javascript/vendor JS_VENDOR_DIR = ./hypha/static_src/javascript/vendor
JS_ESM_DIR = ./hypha/static_src/javascript/esm JS_ESM_DIR = ./hypha/static_src/javascript/esm
...@@ -18,7 +16,7 @@ help: ## Show this help menu with a list of available commands and their descrip ...@@ -18,7 +16,7 @@ help: ## Show this help menu with a list of available commands and their descrip
.PHONY: serve .PHONY: serve
serve: .cache/tandem .cache/py-packages .cache/dev-build-fe ## Run Django server, docs preview, and watch frontend changes serve: .cache/tandem .cache/py-packages .cache/dev-build-fe ## Run Django server, docs preview, and watch frontend changes
@.cache/tandem \ @.cache/tandem \
'python manage.py runserver_plus $(DJANGO_ADDRESS):$(DJANGO_PORT) --settings=$(DJANGO_SETTINGS_MODULE)' \ 'python manage.py runserver_plus --settings=$(DJANGO_SETTINGS_MODULE)' \
'npm:watch:*' \ 'npm:watch:*' \
'mkdocs serve' 'mkdocs serve'
......
...@@ -10,13 +10,14 @@ RELOAD = True ...@@ -10,13 +10,14 @@ RELOAD = True
SECRET_KEY = "CHANGEME!!!" SECRET_KEY = "CHANGEME!!!"
ALLOWED_HOSTS = [ ALLOWED_HOSTS = [
"apply.localhost",
"localhost", "localhost",
"127.0.0.1", "127.0.0.1",
"hypha.test", "hypha.test",
] ]
WAGTAILADMIN_BASE_URL = "http://localhost:8000" RUNSERVERPLUS_SERVER_ADDRESS_PORT = "127.0.0.1:9001"
WAGTAILADMIN_BASE_URL = "http://127.0.0.1:9001"
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
...@@ -64,6 +65,10 @@ if LOCAL_FILE_LOGGING: ...@@ -64,6 +65,10 @@ if LOCAL_FILE_LOGGING:
"backupCount": 2, "backupCount": 2,
"formatter": "standard", "formatter": "standard",
}, },
"console": {
"level": "DEBUG",
"class": "logging.StreamHandler",
},
}, },
"loggers": { "loggers": {
"django": { "django": {
...@@ -99,6 +104,11 @@ if LOCAL_FILE_LOGGING: ...@@ -99,6 +104,11 @@ if LOCAL_FILE_LOGGING:
"handlers": ["logfile"], "handlers": ["logfile"],
"level": "DEBUG", "level": "DEBUG",
}, },
"werkzeug": {
"handlers": ["console"],
"level": "DEBUG",
"propagate": True,
},
}, },
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment