Error handling (#5923)

* More error handling when loading label app

* More error handling when loading report app
This commit is contained in:
Oliver authored and GitHub committed 2023-11-15 23:11:38 +11:00
1 parent 928e00e19c
commit 538a01c500
2 files changed
+23 -16

No files matched your search

+5 -6
View File
@@ -10,10 +10,10 @@ from pathlib import Path
from django.apps import AppConfig
from django.conf import settings
from django.core.exceptions import AppRegistryNotReady
from django.db.utils import OperationalError
from django.db.utils import IntegrityError, OperationalError, ProgrammingError
from InvenTree.ready import (canAppAccessDatabase, isInMainThread,
isPluginRegistryLoaded)
from InvenTree.ready import (canAppAccessDatabase, isImportingData,
isInMainThread, isPluginRegistryLoaded)
logger = logging.getLogger("inventree")
@@ -40,11 +40,10 @@ class LabelConfig(AppConfig):
if not isPluginRegistryLoaded() or not isInMainThread():
return
if canAppAccessDatabase(allow_test=False):
if canAppAccessDatabase(allow_test=False) and not isImportingData():
try:
self.create_labels() # pragma: no cover
except (AppRegistryNotReady, OperationalError):
except (AppRegistryNotReady, IntegrityError, OperationalError, ProgrammingError):
# Database might not yet be ready
warnings.warn('Database was not ready for creating labels', stacklevel=2)