From 2c1c19a34f13ef2486117ddbb8a1cc7305cf6910 Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Sat, 29 Oct 2022 12:49:06 +0200
Subject: [PATCH] small fixes
---
broker/src/asapo_broker/server/process_request.go | 2 +-
.../src/asapo_monitoring_server/server/QueryServer.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/broker/src/asapo_broker/server/process_request.go b/broker/src/asapo_broker/server/process_request.go
index f3ac333df..d65734410 100644
--- a/broker/src/asapo_broker/server/process_request.go
+++ b/broker/src/asapo_broker/server/process_request.go
@@ -110,7 +110,7 @@ func processRequest(w http.ResponseWriter, r *http.Request, op string, extra_par
var ansStats StatsStruct
err = json.Unmarshal(answer, &ansStats)
if err == nil {
- delay := (uint64(time.Now().UnixNano()) / uint64(time.Millisecond)) - ansStats.Timestamp
+ delay := (uint64(time.Now().UnixNano()) - ansStats.Timestamp) / uint64(time.Millisecond)
switch op {
case "next":
fallthrough
diff --git a/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go b/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go
index e5911d61d..416f17b4e 100644
--- a/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go
+++ b/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go
@@ -692,7 +692,7 @@ func (s *QueryServer) GetGroupDelay(ctx context.Context, query *pb.GroupDelayQue
result, err := s.dbQueryApi.Query(ctx, "from(bucket: \""+s.settings.InfluxDbDatabase+"\")"+
" |> range(start: "+startTime+", stop: "+endTime+")"+
" |> filter(fn: (r) => r._measurement == \""+dbMeasurementBrokerFileRequests+"\""+" and r.brokerCommand == \"next\")"+
- " |> filter(fn: (r) => r.beamtime == \""+query.BeamtimeFilter+"\" r._field == \"delayMs\""+
+ " |> filter(fn: (r) => r.beamtime == \""+query.BeamtimeFilter+"\" and r._field == \"delayMs\""+
" |> group(columns: [\"groupId\"])"+
" |> last()"+
" |> keep(columns: [\"groupId\", \"_value\"])"+
--
GitLab