Changed the order of things
All checks were successful
continuous-integration/drone/push Build is passing

also fixed spelling of amqp
This commit is contained in:
2021-07-28 15:13:44 +02:00
parent 414330b3d5
commit 3d423c71c6
4 changed files with 19 additions and 17 deletions

View File

@@ -7,7 +7,7 @@ from xeger import Xeger
from flask_restful import Resource
from flask import request, current_app, abort
import requests
from magic_ampq import magic_ampq
from magic_amqp import magic_amqp
from db import db
from influxus import influx_db
from models import SampleMetadata
@@ -106,12 +106,16 @@ class SampleResource(Resource):
if r.status_code not in [200, 201]:
return abort(500, f"Failed to upload sample to storage service. Upstream status: {r.status_code}: {r.text}")
db.session.commit()
# Announce only after the data is successfully committed
try:
magic_ampq.publish({'tag': generated_tag})
magic_amqp.publish({'tag': generated_tag})
except Exception as e:
current_app.logger.exception(e)
return abort(500, f"AMPQ Publish error: {str(e)}")
return abort(500, f"AMQP Publish error: {str(e)}")
# metrics
if current_app.config['ENABLE_INFLUXDB']:
influx_db.write_points(
[
@@ -128,10 +132,8 @@ class SampleResource(Resource):
]
)
db.session.commit()
return {"tag": generated_tag}, 200
def get(self):
"""
Get all stored items