From 2613b943ce8a361cc835124d940dd1bbbc50731a Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 28 Oct 2015 10:57:01 +0100
Subject: [PATCH] Updated some log output

---
 src/zutil/net/http/HttpHeaderParser.java | 22 +++++++++++++---------
 src/zutil/net/ssdp/SSDPServer.java       | 19 +++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 src/zutil/net/http/HttpHeaderParser.java
 mode change 100644 => 100755 src/zutil/net/ssdp/SSDPServer.java

diff --git a/src/zutil/net/http/HttpHeaderParser.java b/src/zutil/net/http/HttpHeaderParser.java
old mode 100644
new mode 100755
index f457820..43b96d2
--- a/src/zutil/net/http/HttpHeaderParser.java
+++ b/src/zutil/net/http/HttpHeaderParser.java
@@ -260,31 +260,35 @@ public class HttpHeaderParser {
 
 	public String toString(){
 		StringBuffer tmp = new StringBuffer();
-		tmp.append("Type: ").append(type);
-		tmp.append("\nHTTP Version: HTTP/").append(version);
-		tmp.append("\nURL: ").append(url);
+		tmp.append("{Type: ").append(type);
+		tmp.append(", HTTP Version: HTTP/").append(version);
+		tmp.append(", URL: ").append(url);
 
+		tmp.append(", URL Attr: { ");
 		for( String key : url_attr.keySet() ){
-			tmp.append("\nURL Attr: ");
 			tmp.append(key);
-			tmp.append("=");
+			tmp.append(": ");
 			tmp.append( url_attr.get(key) );
 		}
+		tmp.append('}');
 
+		tmp.append(", Header: {");
 		for( String key : headers.keySet() ){
-			tmp.append("\nHeader: ");
 			tmp.append(key);
-			tmp.append("=");
+			tmp.append(": ");
 			tmp.append( headers.get(key) );
 		}
+		tmp.append('}');
 
+		tmp.append(", Cookie: {");
 		for( String key : cookies.keySet() ){
-			tmp.append("\nCookie: ");
 			tmp.append(key);
-			tmp.append("=");
+			tmp.append(": ");
 			tmp.append( cookies.get(key) );
 		}
+		tmp.append('}');
 
+		tmp.append('}');
 		return tmp.toString();
 	}
 }
diff --git a/src/zutil/net/ssdp/SSDPServer.java b/src/zutil/net/ssdp/SSDPServer.java
old mode 100644
new mode 100755
index 482982b..1ed6040
--- a/src/zutil/net/ssdp/SSDPServer.java
+++ b/src/zutil/net/ssdp/SSDPServer.java
@@ -181,7 +181,7 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 				if( header.getRequestURL().equals("*") && "ssdp:discover".equalsIgnoreCase(man) ){
 					// Check if the requested service exists
 					if( services.containsKey( st ) ){
-						logger.log(Level.FINEST, "Received Multicast(from: "+packet.getAddress()+"):\n"+header);
+						logger.log(Level.FINEST, "Received Multicast(from: "+packet.getAddress()+"): "+ header);
 
 						// Generate the SSDP response
 						StringOutputStream response = new StringOutputStream();
@@ -192,20 +192,18 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 						http.setHeader("Server", SERVER_INFO );
 						http.setHeader("ST", st );
 						http.setHeader("EXT", "" );
-						http.setHeader("Cache-Control", "max-age = "+cache_time );
+						http.setHeader("Cache-Control", "max-age = "+ cache_time );
 						if(services.get(st) instanceof SSDPCustomInfo)
 							((SSDPCustomInfo)services.get(st)).setHeaders(http);
-						http.flush();
+                        http.close();
 
 						String strData = response.toString();
-						logger.log(Level.FINEST, "Response:\n"+strData);
 						byte[] data = strData.getBytes();
 						packet = new DatagramPacket( 
 								data, data.length, 
 								packet.getAddress(), 
 								packet.getPort());
 						network.send( packet );
-						http.close();
 					}
 				}
 			}
@@ -228,7 +226,7 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 		}
 	}
 	/**
-	 * Sends keepalive messages to update the cache of the clients
+	 * Sends keep-alive messages to update the cache of the clients
 	 */
 	public void sendNotify(){
 		for(String st : services.keySet()){
@@ -263,15 +261,16 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 			http.setHeader("Location", services.get(searchTarget).getLocation() );
 			http.setHeader("Cache-Control", "max-age = "+cache_time );
 			http.setHeader("USN", services.get(searchTarget).getUSN() );
+            http.flush();
 
-			http.close();
-			logger.log(Level.FINEST, "Notification:\n" + msg);
+			logger.log(Level.FINEST, "Sending Notification: " + msg);
 			byte[] data = msg.toString().getBytes();
 			DatagramPacket packet = new DatagramPacket( 
 					data, data.length, 
 					InetAddress.getByName( SSDP_MULTICAST_ADDR ), 
 					SSDP_PORT );
 			super.send( packet );
+            http.close();
 
 		} catch (Exception e) {
 			logger.log(Level.SEVERE, null, e);
@@ -312,9 +311,9 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 			http.setHeader("NT", searchTarget );
 			http.setHeader("NTS", "ssdp:byebye" );
 			http.setHeader("USN", services.get(searchTarget).getUSN() );
-
 			http.close();
-			logger.log(Level.FINEST, "ByeBye:\n" + msg);
+
+			logger.log(Level.FINEST, "Sending ByeBye: " + msg);
 			byte[] data = msg.toString().getBytes();
 			DatagramPacket packet = new DatagramPacket( 
 					data, data.length,