ereuse/devicehub-django
8
0
Fork 0
Code Issues 6 Pull requests 6 Packages Projects Releases Wiki Activity

Merge branch 'main' into 96-add-serial-number-in-public-web

Browse source
This commit is contained in:
sergio_gimenez 2024-11-06 08:29:24 +01:00
parent 26c3401f4d a67fda6b51
commit 2f68eff954
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.env.example
View file

@ -1,5 +1,6 @@
DOMAIN=localhost 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 DEMO=true
STATIC_ROOT=/tmp/static/ STATIC_ROOT=/tmp/static/

2
dhub/settings.py
View file

@ -34,8 +34,6 @@ DEBUG = config('DEBUG', default=False, cast=bool)
DOMAIN = config("DOMAIN") DOMAIN = config("DOMAIN")
assert DOMAIN not in [None, ''], "DOMAIN var is MANDATORY" 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()) ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=DOMAIN, cast=Csv())
assert DOMAIN in ALLOWED_HOSTS, f"DOMAIN {DOMAIN} is not in ALLOWED_HOSTS {ALLOWED_HOSTS}" assert DOMAIN in ALLOWED_HOSTS, f"DOMAIN {DOMAIN} is not in ALLOWED_HOSTS {ALLOWED_HOSTS}"

2
docker/devicehub-django.entrypoint.sh
View file

@ -18,6 +18,8 @@ deploy() {
if [ "${DEBUG:-}" = 'true' ]; then if [ "${DEBUG:-}" = 'true' ]; then
./manage.py print_settings ./manage.py print_settings
else
echo "DOMAIN: ${DOMAIN}"
fi fi
# detect if existing deployment (TODO only works with sqlite) # detect if existing deployment (TODO only works with sqlite)

4
evidence/management/commands/up_snapshots.py
View file

@ -58,8 +58,6 @@ class Command(BaseCommand):
self.devices.append(Build(s, self.user)) self.devices.append(Build(s, self.user))
move_json(p, self.user.institution.name) move_json(p, self.user.institution.name)
except Exception as err: except Exception as err:
if settings.DEBUG:
logger.exception("%s", err)
snapshot_id = s.get("uuid", "") 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) logger.error(txt, snapshot_id)

6
utils/logger.py
View file

@ -1,4 +1,5 @@
import logging import logging
from django.conf import settings
# Colors # Colors
RED = "\033[91m" RED = "\033[91m"
@ -24,6 +25,11 @@ class CustomFormatter(logging.Formatter):
record.msg = self.highlight_args(record.msg, record.args, color) record.msg = self.highlight_args(record.msg, record.args, color)
record.args = () record.args = ()
# provide trace when DEBUG config
if settings.DEBUG:
import traceback
print(traceback.format_exc())
return super().format(record) return super().format(record)
def highlight_args(self, message, args, color): def highlight_args(self, message, args, color):