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

Updated some log output

Browse source
This commit is contained in:
Ziver Koc 2015-10-28 10:57:01 +01:00 • committed by Ziver Koc
parent 2e476d6689
commit 2613b943ce
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/zutil/net/http/HttpHeaderParser.java Normal file → Executable file
View file

@ -260,31 +260,35 @@ public class HttpHeaderParser {
public String toString(){ public String toString(){
StringBuffer tmp = new StringBuffer(); StringBuffer tmp = new StringBuffer();
tmp.append("Type: ").append(type); tmp.append("{Type: ").append(type);
tmp.append("\nHTTP Version: HTTP/").append(version); tmp.append(", HTTP Version: HTTP/").append(version);
tmp.append("\nURL: ").append(url); tmp.append(", URL: ").append(url);
tmp.append(", URL Attr: { ");
for( String key : url_attr.keySet() ){ for( String key : url_attr.keySet() ){
tmp.append("\nURL Attr: ");
tmp.append(key); tmp.append(key);
tmp.append("="); tmp.append(": ");
tmp.append( url_attr.get(key) ); tmp.append( url_attr.get(key) );
} }
tmp.append('}');
tmp.append(", Header: {");
for( String key : headers.keySet() ){ for( String key : headers.keySet() ){
tmp.append("\nHeader: ");
tmp.append(key); tmp.append(key);
tmp.append("="); tmp.append(": ");
tmp.append( headers.get(key) ); tmp.append( headers.get(key) );
} }
tmp.append('}');
tmp.append(", Cookie: {");
for( String key : cookies.keySet() ){ for( String key : cookies.keySet() ){
tmp.append("\nCookie: ");
tmp.append(key); tmp.append(key);
tmp.append("="); tmp.append(": ");
tmp.append( cookies.get(key) ); tmp.append( cookies.get(key) );
} }
tmp.append('}');
tmp.append('}');
return tmp.toString(); return tmp.toString();
} }
} }

19
src/zutil/net/ssdp/SSDPServer.java Normal file → Executable file
View file

@ -181,7 +181,7 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
if( header.getRequestURL().equals("*") && "ssdp:discover".equalsIgnoreCase(man) ){ if( header.getRequestURL().equals("*") && "ssdp:discover".equalsIgnoreCase(man) ){
// Check if the requested service exists // Check if the requested service exists
if( services.containsKey( st ) ){ 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 // Generate the SSDP response
StringOutputStream response = new StringOutputStream(); StringOutputStream response = new StringOutputStream();
@ -192,20 +192,18 @@ public class SSDPServer extends ThreadedUDPNetwork implements ThreadedUDPNetwork
http.setHeader("Server", SERVER_INFO ); http.setHeader("Server", SERVER_INFO );
http.setHeader("ST", st ); http.setHeader("ST", st );
http.setHeader("EXT", "" ); 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) if(services.get(st) instanceof SSDPCustomInfo)
((SSDPCustomInfo)services.get(st)).setHeaders(http); ((SSDPCustomInfo)services.get(st)).setHeaders(http);
http.flush(); http.close();
String strData = response.toString(); String strData = response.toString();
logger.log(Level.FINEST, "Response:\n"+strData);
byte[] data = strData.getBytes(); byte[] data = strData.getBytes();
packet = new DatagramPacket( packet = new DatagramPacket(
data, data.length, data, data.length,
packet.getAddress(), packet.getAddress(),
packet.getPort()); packet.getPort());
network.send( packet ); 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(){ public void sendNotify(){
for(String st : services.keySet()){ 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("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() );
http.flush();
http.close(); logger.log(Level.FINEST, "Sending Notification: " + msg);
logger.log(Level.FINEST, "Notification:\n" + 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);
@ -312,9 +311,9 @@ 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(); http.close();
logger.log(Level.FINEST, "ByeBye:\n" + msg);
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,