From 138973b7ac84588ced44c63362e8d1d9d24a626f Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 12 Mar 2020 10:25:21 +0000
Subject: [PATCH] Handle missing headers

---
 appservice/consumers/roomserver.go       | 5 +++++
 clientapi/consumers/roomserver.go        | 5 +++++
 federationsender/consumers/roomserver.go | 5 +++++
 publicroomsapi/consumers/roomserver.go   | 5 +++++
 syncapi/consumers/roomserver.go          | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go
index b9e94f3bd..417b1d170 100644
--- a/appservice/consumers/roomserver.go
+++ b/appservice/consumers/roomserver.go
@@ -91,6 +91,11 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 			)
 			return nil
 		}
+	} else {
+		log.WithField("type", msgtype).Debug(
+			"roomserver output log: no message type included",
+		)
+		return nil
 	}
 
 	// See if the room version is present in the headers. If it isn't
diff --git a/clientapi/consumers/roomserver.go b/clientapi/consumers/roomserver.go
index aa9adf246..36b03f96c 100644
--- a/clientapi/consumers/roomserver.go
+++ b/clientapi/consumers/roomserver.go
@@ -81,6 +81,11 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 			)
 			return nil
 		}
+	} else {
+		log.WithField("type", msgtype).Debug(
+			"roomserver output log: no message type included",
+		)
+		return nil
 	}
 
 	// See if the room version is present in the headers. If it isn't
diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go
index 9fdde072e..34ae5a7a5 100644
--- a/federationsender/consumers/roomserver.go
+++ b/federationsender/consumers/roomserver.go
@@ -84,6 +84,11 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 			)
 			return nil
 		}
+	} else {
+		log.WithField("type", msgtype).Debug(
+			"roomserver output log: no message type included",
+		)
+		return nil
 	}
 
 	// See if the room version is present in the headers. If it isn't
diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go
index b47be5c9d..1bb9352e2 100644
--- a/publicroomsapi/consumers/roomserver.go
+++ b/publicroomsapi/consumers/roomserver.go
@@ -74,6 +74,11 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 			)
 			return nil
 		}
+	} else {
+		log.WithField("type", msgtype).Debug(
+			"roomserver output log: no message type included",
+		)
+		return nil
 	}
 
 	// See if the room version is present in the headers. If it isn't
diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index dec4d644a..14f923a03 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -84,6 +84,11 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 			)
 			return nil
 		}
+	} else {
+		log.WithField("type", msgtype).Debug(
+			"roomserver output log: no message type included",
+		)
+		return nil
 	}
 
 	// See if the room version is present in the headers. If it isn't