Fix logging for query creation on error (#132)

fleetdm · Dec 15, 2020 · 55a2aa2 · 55a2aa2
1 parent c1cc0e4
commit 55a2aa2
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/server/service/logging_queries.go b/server/service/logging_queries.go
@@ -95,6 +95,15 @@ func (mw loggingMiddleware) NewQuery(ctx context.Context, p kolide.QueryPayload)
 		loggedInUser = vc.Username()
 	}
 	defer func(begin time.Time) {
+		if query == nil {
+			_ = mw.loggerInfo(err).Log(
+				"method", "NewQuery",
+				"err", err,
+				"user", loggedInUser,
+				"took", time.Since(begin),
+			)
+			return
+		}
 		_ = mw.loggerInfo(err).Log(
 			"method", "NewQuery",
 			"err", err,