inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-03 13:58:47 +00:00
Code

Handle exception when creating default labels (#5163) (#5166)

Browse Source 
* Handle exception when creating default labels

- Running workers in parallel may cause race conditions
- Catch any exception which is raised

* Prevent password from being logged

* Update default timeout for docker

(cherry picked from commit 8b730884d70e7e2712bc79ad14c79b5fc0cc746d)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2023-07-04 22:54:21 +10:00 committed by GitHub
parent 698798fee7
commit 4a5ebf8f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/apps.py
View File

@ -195,8 +195,8 @@ class InvenTreeConfig(AppConfig):
else: else:
new_user = user.objects.create_superuser(add_user, add_email, add_password) new_user = user.objects.create_superuser(add_user, add_email, add_password)
logger.info(f'User {str(new_user)} was created!') logger.info(f'User {str(new_user)} was created!')
except IntegrityError as _e: except IntegrityError:
logger.warning(f'The user "{add_user}" could not be created due to the following error:\n{str(_e)}') logger.warning(f'The user "{add_user}" could not be created')
# do not try again # do not try again
settings.USER_ADDED = True settings.USER_ADDED = True

4
InvenTree/label/apps.py
View File

@ -182,6 +182,7 @@ class LabelConfig(AppConfig):
logger.info(f"Creating entry for {model} '{label['name']}'") logger.info(f"Creating entry for {model} '{label['name']}'")
try:
model.objects.create( model.objects.create(
name=label['name'], name=label['name'],
description=label['description'], description=label['description'],
@ -191,4 +192,5 @@ class LabelConfig(AppConfig):
width=label['width'], width=label['width'],
height=label['height'], height=label['height'],
) )
return except Exception:
logger.warning(f"Failed to create label '{label['name']}'")

2
docker/production/.env
View File

@ -42,7 +42,7 @@ INVENTREE_DB_PORT=5432
#INVENTREE_CACHE_PORT=6379 #INVENTREE_CACHE_PORT=6379
# Options for gunicorn server # Options for gunicorn server
INVENTREE_GUNICORN_TIMEOUT=30 INVENTREE_GUNICORN_TIMEOUT=90
# Enable custom plugins? # Enable custom plugins?
INVENTREE_PLUGINS_ENABLED=False INVENTREE_PLUGINS_ENABLED=False