From 4ebe0b4ee756c8b9db29688d75361fc8fefefa91 Mon Sep 17 00:00:00 2001
From: osmala <ossi.laine@utu.fi>
Date: Wed, 10 Jun 2020 15:34:19 +0300
Subject: [PATCH] TODO comment for unfinished business
---
app/experiment/views.py | 14 ++++++++------
app/static/js/getCSV.js | 3 +++
app/utils.py | 1 +
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/app/experiment/views.py b/app/experiment/views.py
index 241ecb6..e969a1d 100644
--- a/app/experiment/views.py
+++ b/app/experiment/views.py
@@ -1060,18 +1060,13 @@ def create_embody(meta):
emit('end', {'path': img_path})
-@socketio.on('end', namespace="/create_embody")
-def end_create_embody():
- db.session.close()
-
-
@socketio.on('connect', namespace="/download_csv")
def start_download_csv():
emit('success', {'connection': 'Start generating CSV file'})
@socketio.on('generate_csv', namespace="/download_csv")
-def process_download_csv(meta):
+def download_csv(meta):
exp_id = meta["exp_id"]
data = generate_csv(exp_id)
@@ -1096,4 +1091,11 @@ def process_download_csv(meta):
@socketio.on('end', namespace="/download_csv")
def end_download_csv():
+ # TODO: not working solution... db session keeps hanging after socket session has ended
+ # mysqld timeout is set to 180s, so it kills hanging connections, but this is not a good solution
+ db.session.close()
+
+
+@socketio.on('end', namespace="/create_embody")
+def end_create_embody():
db.session.close()
diff --git a/app/static/js/getCSV.js b/app/static/js/getCSV.js
index 9c20c76..4b0313b 100644
--- a/app/static/js/getCSV.js
+++ b/app/static/js/getCSV.js
@@ -26,6 +26,7 @@ $(document).ready(function() {
socket.on('timeout', function(data) {
// kill connection
+
socket.emit('end')
socket.disconnect()
@@ -39,6 +40,8 @@ $(document).ready(function() {
});
socket.on('file_ready', function(file) {
+
+ socket.emit('end')
socket.disconnect()
exportButton.text('File is ready!')
diff --git a/app/utils.py b/app/utils.py
index ebf43e4..d8aa68c 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -142,6 +142,7 @@ select distinct p.idpage, q.idquestion from question q join page p on p.experime
'''
+
@timeit
def generate_csv(exp_id):
--
GitLab