client: show Conten-Type in JSONL response

Author: MaxKellermann

debian/changelog

@@ -2,6 +2,7 @@ cm4all-pond (0.35) unstable; urgency=low
 
   * client: show REMOTE_HOST in message lines
   * client: support ISO8601 time stamps in message lines
+  * client: show Conten-Type in JSONL response
 
  --   
 

src/client/FormatJson.cxx

@@ -10,6 +10,7 @@
 #include "time/ISO8601.hxx"
 #include "net/log/String.hxx"
 #include "net/log/Datagram.hxx"
+#include "net/log/ContentType.hxx"
 #include "util/StringBuffer.hxx"
 
 char *
@@ -66,6 +67,10 @@ FormatJson(char *buffer, char *end,
 	if (d.valid_length)
 		o.AddMember("length", d.length);
 
+	if (const auto content_type = Net::Log::ToString(d.content_type);
+	    !content_type.empty())
+		o.AddMember("content_type", content_type);
+
 	if (d.valid_traffic) {
 		o.AddMember("traffic_received", d.traffic_received);
 		o.AddMember("traffic_sent", d.traffic_sent);