From 304213c1d2ce69d9ea1237f887c4ab1651144c91 Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Wed, 28 Oct 2015 12:57:36 +0100
Subject: [PATCH] Updated loggin

---
 src/zutil/log/LogUtil.java               |  1 -
 src/zutil/net/http/HttpHeaderParser.java | 10 +++----
 src/zutil/net/http/HttpPrintStream.java  | 34 ++++++++++++++++++++++++
 src/zutil/net/ssdp/SSDPServer.java       | 11 +++++---
 4 files changed, 46 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 src/zutil/log/LogUtil.java
 mode change 100644 => 100755 src/zutil/net/http/HttpPrintStream.java

diff --git a/src/zutil/log/LogUtil.java b/src/zutil/log/LogUtil.java
old mode 100644
new mode 100755
index 814f855..0928e28
--- a/src/zutil/log/LogUtil.java
+++ b/src/zutil/log/LogUtil.java
@@ -51,7 +51,6 @@ public class LogUtil {
 		for(int i=1; i<stackTraceElements.length ;++i){
 			String name = stackTraceElements[i].getClassName();
 			if( !name.equals( LogUtil.class.getName() ) ){
-				//logger.fine("Calling class: \""+name+"\"");
 				return name;
 			}
 		}
diff --git a/src/zutil/net/http/HttpHeaderParser.java b/src/zutil/net/http/HttpHeaderParser.java
index 43b96d2..bfca686 100755
--- a/src/zutil/net/http/HttpHeaderParser.java
+++ b/src/zutil/net/http/HttpHeaderParser.java
@@ -259,12 +259,12 @@ public class HttpHeaderParser {
 
 
 	public String toString(){
-		StringBuffer tmp = new StringBuffer();
+		StringBuilder tmp = new StringBuilder();
 		tmp.append("{Type: ").append(type);
-		tmp.append(", HTTP Version: HTTP/").append(version);
+		tmp.append(", HTTP_version: HTTP/").append(version);
 		tmp.append(", URL: ").append(url);
 
-		tmp.append(", URL Attr: { ");
+		tmp.append(", URL_attr: { ");
 		for( String key : url_attr.keySet() ){
 			tmp.append(key);
 			tmp.append(": ");
@@ -272,7 +272,7 @@ public class HttpHeaderParser {
 		}
 		tmp.append('}');
 
-		tmp.append(", Header: {");
+		tmp.append(", Headers: {");
 		for( String key : headers.keySet() ){
 			tmp.append(key);
 			tmp.append(": ");
@@ -280,7 +280,7 @@ public class HttpHeaderParser {
 		}
 		tmp.append('}');
 
-		tmp.append(", Cookie: {");
+		tmp.append(", Cookies: {");
 		for( String key : cookies.keySet() ){
 			tmp.append(key);
 			tmp.append(": ");
diff --git a/src/zutil/net/http/HttpPrintStream.java b/src/zutil/net/http/HttpPrintStream.java
old mode 100644
new mode 100755
index 7b4ea00..aa0dd19
--- a/src/zutil/net/http/HttpPrintStream.java
+++ b/src/zutil/net/http/HttpPrintStream.java
@@ -314,4 +314,38 @@ public class HttpPrintStream extends OutputStream{
 		default:  return "";
 		}
 	}
+
+	public String toString() {
+        StringBuilder str = new StringBuilder();
+        str.append("{http_type: ").append(message_type);
+        if (res_status_code != null) {
+                if (message_type == HttpMessageType.REQUEST) {
+                    str.append(", req_type: ").append(req_type);
+                    str.append(", req_url: ").append(req_url);
+                } else {
+                    str.append(", status_code: ").append(res_status_code);
+                    str.append(", status_str: ").append(getStatusString(res_status_code));
+                }
+
+            if (headers != null) {
+                str.append(", Headers: {");
+                for (String key : headers.keySet()) {
+                    str.append(key).append(": ").append(headers.get(key)).append(", ");
+                }
+                str.append('}');
+            }
+            if (cookies != null) {
+                str.append(", Cookies: {");
+                for (String key : cookies.keySet()) {
+                    str.append(key).append(": ").append(cookies.get(key)).append(", ");
+                }
+                str.append('}');
+            }
+        }
+        else
+            str.append(", HEADER ALREADY SENT ");
+        str.append('}');
+
+        return str.toString();
+    }
 }
diff --git a/src/zutil/net/ssdp/SSDPServer.java b/src/zutil/net/ssdp/SSDPServer.java
index 1ed6040..a6cc1c4 100755
--- a/src/zutil/net/ssdp/SSDPServer.java
+++ b/src/zutil/net/ssdp/SSDPServer.java
@@ -195,7 +195,8 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 						http.setHeader("Cache-Control", "max-age = "+ cache_time );
 						if(services.get(st) instanceof SSDPCustomInfo)
 							((SSDPCustomInfo)services.get(st)).setHeaders(http);
-                        http.close();
+                        logger.log(Level.FINEST, "Sending Response: "+ http);
+                        http.flush();
 
 						String strData = response.toString();
 						byte[] data = strData.getBytes();
@@ -204,6 +205,7 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
 								packet.getAddress(), 
 								packet.getPort());
 						network.send( packet );
+                        http.close();
 					}
 				}
 			}
@@ -261,9 +263,9 @@ 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() );
+            logger.log(Level.FINEST, "Sending Notification: " + http);
             http.flush();
 
-			logger.log(Level.FINEST, "Sending Notification: " + msg);
 			byte[] data = msg.toString().getBytes();
 			DatagramPacket packet = new DatagramPacket( 
 					data, data.length, 
@@ -311,15 +313,16 @@ 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, "Sending ByeBye: " + http);
+            http.flush();
 
-			logger.log(Level.FINEST, "Sending ByeBye: " + 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);