diff --git a/.env.example b/.env.example index ce046cd..cb97c80 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,6 @@ DOMAIN=localhost -# note that DEBUG=true make snapshot parsing more verbose +# note that with DEBUG=true, logs are more verbose (include tracebacks) +DEBUG=true DEMO=true STATIC_ROOT=/tmp/static/ diff --git a/dhub/settings.py b/dhub/settings.py index d93f719..0dc3d84 100644 --- a/dhub/settings.py +++ b/dhub/settings.py @@ -34,8 +34,6 @@ DEBUG = config('DEBUG', default=False, cast=bool) DOMAIN = config("DOMAIN") assert DOMAIN not in [None, ''], "DOMAIN var is MANDATORY" -# this var is very important, we print it -print("DOMAIN: " + DOMAIN) ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=DOMAIN, cast=Csv()) assert DOMAIN in ALLOWED_HOSTS, f"DOMAIN {DOMAIN} is not in ALLOWED_HOSTS {ALLOWED_HOSTS}" diff --git a/docker/devicehub-django.entrypoint.sh b/docker/devicehub-django.entrypoint.sh index bdf1008..fb057f9 100644 --- a/docker/devicehub-django.entrypoint.sh +++ b/docker/devicehub-django.entrypoint.sh @@ -18,6 +18,8 @@ deploy() { if [ "${DEBUG:-}" = 'true' ]; then ./manage.py print_settings + else + echo "DOMAIN: ${DOMAIN}" fi # detect if existing deployment (TODO only works with sqlite) diff --git a/evidence/management/commands/up_snapshots.py b/evidence/management/commands/up_snapshots.py index 69ac134..c987d76 100644 --- a/evidence/management/commands/up_snapshots.py +++ b/evidence/management/commands/up_snapshots.py @@ -58,8 +58,6 @@ class Command(BaseCommand): self.devices.append(Build(s, self.user)) move_json(p, self.user.institution.name) except Exception as err: - if settings.DEBUG: - logger.exception("%s", err) snapshot_id = s.get("uuid", "") - txt = "It is not possible to parse snapshot: %s" + txt = "Could not parse snapshot: %s" logger.error(txt, snapshot_id) diff --git a/utils/logger.py b/utils/logger.py index b97fe2e..df85e7e 100644 --- a/utils/logger.py +++ b/utils/logger.py @@ -1,4 +1,5 @@ import logging +from django.conf import settings # Colors RED = "\033[91m" @@ -24,6 +25,11 @@ class CustomFormatter(logging.Formatter): record.msg = self.highlight_args(record.msg, record.args, color) record.args = () + # provide trace when DEBUG config + if settings.DEBUG: + import traceback + print(traceback.format_exc()) + return super().format(record) def highlight_args(self, message, args, color):