From 55a2aa2c955a99483b730e60207e4afada7bda8a Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@dactiv.llc>
Date: Tue, 15 Dec 2020 02:45:03 +0000
Subject: [PATCH] Fix logging for query creation on error (#132)

---
 server/service/logging_queries.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/service/logging_queries.go b/server/service/logging_queries.go
index 5cda206ce3..22e1e785cd 100644
--- 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,