From 8465bf92df146b13347aac034e3c38df06ea921a Mon Sep 17 00:00:00 2001
From: marcsello <punkosdmarcell@rocketmail.com>
Date: Thu, 9 Dec 2021 22:11:32 +0100
Subject: [PATCH] eh

---
 birb_latency_collector/views/report_view.py | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/birb_latency_collector/views/report_view.py b/birb_latency_collector/views/report_view.py
index 931c0fb..f1dfa53 100644
--- a/birb_latency_collector/views/report_view.py
+++ b/birb_latency_collector/views/report_view.py
@@ -30,17 +30,17 @@ class ReportView(FlaskView):
 
     @route("/link", methods=['GET'])
     def link_get(self):
-        q = influxdb_instance.connection.query_api()
         response = {}
 
         # Query latency
 
-        latency_tables = q.query(f"""from(bucket: "alma")
+        query = """from(bucket: "alma")
         |> range(start: -2m, stop: now())
         |> filter(fn: (r) => r["_measurement"] == "link_latency")
         |> timedMovingAverage(every: 30s, period: 1m)
         |> last()
-        |> yield()""")
+        |> yield()"""
+        latency_tables = influxdb_instance.query_api(query)
 
         for table in latency_tables:
             for value in table.values:
@@ -52,12 +52,13 @@ class ReportView(FlaskView):
 
         # Query rate
 
-        rate_tables = q.query(f"""from(bucket: "alma")
+        query = """from(bucket: "alma")
         |> range(start: -2m, stop: now())
         |> filter(fn: (r) => r["_measurement"] == "link_rate")
         |> timedMovingAverage(every: 30s, period: 1m)
         |> last()
-        |> yield()""")
+        |> yield()"""
+        rate_tables = influxdb_instance.query_api(query)
 
         for table in rate_tables:
             for value in table.values:
@@ -91,19 +92,19 @@ class ReportView(FlaskView):
 
     @route("/client", methods=['GET'])
     def client_get(self):
-        q = influxdb_instance.connection.query_api()
         response = {}
 
         # Query queue
 
-        latency_tables = q.query(f"""from(bucket: "alma")
+        query = """from(bucket: "alma")
         |> range(start: -2m, stop: now())
         |> filter(fn: (r) => r["_measurement"] == "client_queue")
         |> timedMovingAverage(every: 30s, period: 1m)
         |> last()
-        |> yield()""")
+        |> yield()"""
+        queue_tables = influxdb_instance.query_api(query)
 
-        for table in latency_tables:
+        for table in queue_tables:
             for value in table.values:
                 key = value['client']
                 if key in response:
@@ -140,14 +141,15 @@ class ReportView(FlaskView):
 
         # Query queue
 
-        latency_tables = q.query(f"""from(bucket: "alma")
+        query = """from(bucket: "alma")
         |> range(start: -2m, stop: now())
         |> filter(fn: (r) => r["_measurement"] == "site_queue")
         |> timedMovingAverage(every: 30s, period: 1m)
         |> last()
-        |> yield()""")
+        |> yield()"""
+        queue_tables = influxdb_instance.query_api(query)
 
-        for table in latency_tables:
+        for table in queue_tables:
             for value in table.values:
                 key = value['site']
                 if key in response: