ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Updated loggin

Browse source
This commit is contained in:
Ziver Koc 2015-10-28 12:57:36 +01:00
parent 2613b943ce
commit 304213c1d2
4 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/zutil/log/LogUtil.java Normal file → Executable file
View file

@ -51,7 +51,6 @@ public class LogUtil {
for(int i=1; i<stackTraceElements.length ;++i){ for(int i=1; i<stackTraceElements.length ;++i){
String name = stackTraceElements[i].getClassName(); String name = stackTraceElements[i].getClassName();
if( !name.equals( LogUtil.class.getName() ) ){ if( !name.equals( LogUtil.class.getName() ) ){
//logger.fine("Calling class: \""+name+"\"");
return name; return name;
} }
} }

10
src/zutil/net/http/HttpHeaderParser.java
View file

@ -259,12 +259,12 @@ public class HttpHeaderParser {
public String toString(){ public String toString(){
StringBuffer tmp = new StringBuffer(); StringBuilder tmp = new StringBuilder();
tmp.append("{Type: ").append(type); 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: ").append(url);
tmp.append(", URL Attr: { "); tmp.append(", URL_attr: { ");
for( String key : url_attr.keySet() ){ for( String key : url_attr.keySet() ){
tmp.append(key); tmp.append(key);
tmp.append(": "); tmp.append(": ");
@ -272,7 +272,7 @@ public class HttpHeaderParser {
} }
tmp.append('}'); tmp.append('}');
tmp.append(", Header: {"); tmp.append(", Headers: {");
for( String key : headers.keySet() ){ for( String key : headers.keySet() ){
tmp.append(key); tmp.append(key);
tmp.append(": "); tmp.append(": ");
@ -280,7 +280,7 @@ public class HttpHeaderParser {
} }
tmp.append('}'); tmp.append('}');
tmp.append(", Cookie: {"); tmp.append(", Cookies: {");
for( String key : cookies.keySet() ){ for( String key : cookies.keySet() ){
tmp.append(key); tmp.append(key);
tmp.append(": "); tmp.append(": ");

34
src/zutil/net/http/HttpPrintStream.java Normal file → Executable file
View file

@ -314,4 +314,38 @@ public class HttpPrintStream extends OutputStream{
default: return ""; 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();
}
} }

11
src/zutil/net/ssdp/SSDPServer.java
View file

@ -195,7 +195,8 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
http.setHeader("Cache-Control", "max-age = "+ cache_time ); http.setHeader("Cache-Control", "max-age = "+ cache_time );
if(services.get(st) instanceof SSDPCustomInfo) if(services.get(st) instanceof SSDPCustomInfo)
((SSDPCustomInfo)services.get(st)).setHeaders(http); ((SSDPCustomInfo)services.get(st)).setHeaders(http);
http.close(); logger.log(Level.FINEST, "Sending Response: "+ http);
http.flush();
String strData = response.toString(); String strData = response.toString();
byte[] data = strData.getBytes(); byte[] data = strData.getBytes();
@ -204,6 +205,7 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
packet.getAddress(), packet.getAddress(),
packet.getPort()); packet.getPort());
network.send( packet ); 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("Location", services.get(searchTarget).getLocation() );
http.setHeader("Cache-Control", "max-age = "+cache_time ); http.setHeader("Cache-Control", "max-age = "+cache_time );
http.setHeader("USN", services.get(searchTarget).getUSN() ); http.setHeader("USN", services.get(searchTarget).getUSN() );
logger.log(Level.FINEST, "Sending Notification: " + http);
http.flush(); http.flush();
logger.log(Level.FINEST, "Sending Notification: " + msg);
byte[] data = msg.toString().getBytes(); byte[] data = msg.toString().getBytes();
DatagramPacket packet = new DatagramPacket( DatagramPacket packet = new DatagramPacket(
data, data.length, data, data.length,
@ -311,15 +313,16 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
http.setHeader("NT", searchTarget ); http.setHeader("NT", searchTarget );
http.setHeader("NTS", "ssdp:byebye" ); http.setHeader("NTS", "ssdp:byebye" );
http.setHeader("USN", services.get(searchTarget).getUSN() ); 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(); byte[] data = msg.toString().getBytes();
DatagramPacket packet = new DatagramPacket( DatagramPacket packet = new DatagramPacket(
data, data.length, data, data.length,
InetAddress.getByName( SSDP_MULTICAST_ADDR ), InetAddress.getByName( SSDP_MULTICAST_ADDR ),
SSDP_PORT ); SSDP_PORT );
super.send( packet ); super.send( packet );
http.close();
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, null, e); logger.log(Level.SEVERE, null, e);