inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 20:46:47 +00:00
Code

Add testing to detecte loops

Browse Source 
Fixes #2308
This commit is contained in:
Matthias 2021-11-20 23:18:45 +01:00
parent 2f739bfbfa
commit 39648e545c
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/InvenTree/settings.py
View File

@ -885,3 +885,4 @@ if DEBUG or TESTING:
# Plugin test settings # Plugin test settings
PLUGIN_TESTING = get_setting('PLUGIN_TESTING', TESTING) # are plugins beeing tested? PLUGIN_TESTING = get_setting('PLUGIN_TESTING', TESTING) # are plugins beeing tested?
PLUGIN_TESTING_SETUP = get_setting('PLUGIN_TESTING_SETUP', False) # load plugins from setup hooks in testing? PLUGIN_TESTING_SETUP = get_setting('PLUGIN_TESTING_SETUP', False) # load plugins from setup hooks in testing?
PLUGIN_RETRY = get_setting('PLUGIN_RETRY', 5 if not TESTING else 1) # how often should plugin loading be tried?

8
InvenTree/plugin/registry.py
View File

@ -65,6 +65,7 @@ class Plugins:
registered_sucessfull = False registered_sucessfull = False
blocked_plugin = None blocked_plugin = None
retry_counter = settings.PLUGIN_RETRY
while not registered_sucessfull: while not registered_sucessfull:
try: try:
# we are using the db so for migrations etc we need to try this block # we are using the db so for migrations etc we need to try this block
@ -84,6 +85,13 @@ class Plugins:
self._clean_installed_apps() self._clean_installed_apps()
self._activate_plugins(force_reload=True) self._activate_plugins(force_reload=True)
# we do not want to end in an endless loop
retry_counter -=1
if retry_counter <= 0:
if settings.PLUGIN_TESTING:
print('Max retries, breaking loading')
break
# now the loading will re-start up with init # now the loading will re-start up with init
# remove maintenance # remove maintenance