Merge branch 'main' of github.com:sartography/spiffworkflow-backend

# Conflicts:
#	src/spiffworkflow_backend/services/process_instance_service.py
This commit is contained in:
mike cullerton 2022-10-25 12:02:28 -04:00
commit 137ebbc4b7

View File

@ -68,15 +68,13 @@ class ProcessInstanceService:
) )
processor = ProcessInstanceProcessor(process_instance) processor = ProcessInstanceProcessor(process_instance)
processor.do_engine_steps(save=True) processor.do_engine_steps(save=True)
except Exception: except Exception as e:
db.session.rollback() # in case the above left the database with a bad transaction db.session.rollback() # in case the above left the database with a bad transaction
process_instance.status = ProcessInstanceStatus.erroring.value process_instance.status = ProcessInstanceStatus.erroring.value
db.session.add(process_instance) db.session.add(process_instance)
db.session.commit() db.session.commit()
error_message = ( error_message = f"Error running waiting task for process_instance {process_instance.id}" + \
f"Error running waiting task for process_instance {process_instance.id}" f"({process_instance.process_model_identifier}). {str(e)}"
+ "({process_instance.process_model_identifier}). {str(e)}"
)
current_app.logger.error(error_message) current_app.logger.error(error_message)
@staticmethod @staticmethod