Menu
▾
▴
[SwapDV-commit] CVS: swapdv/ReplayServer HttpRequest.java,1.2,1.3 HttpResponse.java,1.10,1.11 ReplayDetails.java,1.10,1.11 ReplayServer.java,1.12,1.13
|
From: Gerry D. <gd...@us...> - 2002-06-11 15:50:07
|
Update of /cvsroot/swapdv/swapdv/ReplayServer In directory usw-pr-cvs1:/tmp/cvs-serv29659/ReplayServer Modified Files: HttpRequest.java HttpResponse.java ReplayDetails.java ReplayServer.java Log Message: Changed all println()'s over the Logger.logs, added --debug switch and initial deleteShowActions Index: HttpRequest.java =================================================================== RCS file: /cvsroot/swapdv/swapdv/ReplayServer/HttpRequest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HttpRequest.java 3 Jun 2002 23:03:03 -0000 1.2 +++ HttpRequest.java 11 Jun 2002 15:50:04 -0000 1.3 @@ -34,6 +34,7 @@ import java.util.*; import java.io.*; +import swapdv.Logger.*; public class HttpRequest { public Properties requestPairs; @@ -59,7 +60,7 @@ is.read(); c++; } - System.out.println("Discarded "+c+" body bytes"); + Logger.log(0, LoggerI.LEVEL_DEBUG, "Discarded "+c+" body bytes"); } private String readLine() throws IOException { @@ -82,18 +83,18 @@ private void processHeader() throws IOException { String line; try { - System.out.println("Trying to process next HTTP request"); + Logger.log(0, LoggerI.LEVEL_DEBUG, "Trying to process next HTTP request"); request = readLine(); - System.out.println("Request: " + request); + Logger.log(0, LoggerI.LEVEL_DEBUG, "Request: " + request); StringTokenizer tokenizer = new StringTokenizer(request," "); requestType = tokenizer.nextToken(); - //System.out.println("requestType: "+requestType); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "requestType: "+requestType); if (tokenizer.hasMoreTokens()) requestPath = tokenizer.nextToken(); else { - System.out.println("WARNING: no request path"); + Logger.log(0, LoggerI.LEVEL_WARN, "no request path"); requestPath=""; } - //System.out.println("requestPath: "+requestPath); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "requestPath: "+requestPath); int offset = requestPath.indexOf('?'); if (offset>=0) { queryPairs = decodeString(requestPath.substring(offset+1)); @@ -101,26 +102,26 @@ } else queryPairs = new Properties(); if (tokenizer.hasMoreTokens()) requestProtocol = tokenizer.nextToken(); else { - System.out.println("WARNING: no request protocol"); + Logger.log(0, LoggerI.LEVEL_WARN, "no request protocol"); requestProtocol=""; } - //System.out.println("requestProtocol: "+requestProtocol); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "requestProtocol: "+requestProtocol); line = readLine(); int index; while ((line!=null) && (line.length()>2)) { index = line.indexOf((int)':'); if (index<0) { - System.out.println("Malformed request line: " + line); + Logger.log(0, LoggerI.LEVEL_DEBUG, "Malformed request line: " + line); } else { String rname = line.substring(0,index).trim(); String rvalue = line.substring(index+1,line.length()).trim(); requestPairs.put(rname.toLowerCase(),rvalue); - //System.out.println("Adding pair " + rname + "="+rvalue); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "Adding pair " + rname + "="+rvalue); } line = readLine(); } } catch (IOException e) { - //System.out.println("IO exception reading HTTP header " + e); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "IO exception reading HTTP header " + e); //e.printStackTrace(); throw e; } @@ -141,7 +142,7 @@ name = pair; value = ""; } - //System.out.println("decodeString: adding pair " + name +" = "+ value); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "decodeString: adding pair " + name +" = "+ value); name = decode(name); value = decode(value); p.put(name,value); Index: HttpResponse.java =================================================================== RCS file: /cvsroot/swapdv/swapdv/ReplayServer/HttpResponse.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- HttpResponse.java 7 Jun 2002 20:27:34 -0000 1.10 +++ HttpResponse.java 11 Jun 2002 15:50:04 -0000 1.11 @@ -34,6 +34,7 @@ import java.util.*; import java.io.*; import java.net.*; +import swapdv.Logger.*; public class HttpResponse { public Hashtable headers; @@ -96,7 +97,7 @@ public void sendBody(byte body[]) throws IOException { writeString(os,getPaddedHex(body.length)+"\r\n"); - //System.out.println("OUT ["+body.length+" bytes]"); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "OUT ["+body.length+" bytes]"); os.write(body); } @@ -126,7 +127,7 @@ fis.skip(offset); } catch (FileNotFoundException f) { - System.out.println("file "+filename+" was not found"); + Logger.log(0, LoggerI.LEVEL_ERR, "file "+filename+" was not found"); writeString(os, "00000009\r\n80820005\r\n"); return; } @@ -153,7 +154,7 @@ os.write(buffer,0,(int)totalBytesRead); os.flush(); pcb.uploadProgress(progress, os.getBytesSent()); - //System.out.println("OUT ["+totalBytesRead+" bytes]"); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "OUT ["+totalBytesRead+" bytes]"); firstTime = false; } while (fis.available()>0); } catch (IOException ex) { //make sure we close the file @@ -192,7 +193,7 @@ } os.write(buffer,0,(int)totalBytesRead); os.flush(); - //System.out.println("OUT ["+totalBytesRead+" bytes]"); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "OUT ["+totalBytesRead+" bytes]"); firstTime = false; } while (fis.available()>0); } catch (IOException ex) { //make sure we close the file @@ -241,7 +242,7 @@ while (fis.available()>0) { int bytesRead = fis.read(buffer); bos.write(buffer,0,bytesRead); - //System.out.println("BODYOUT "+bytesRead+" bytes"); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "BODYOUT "+bytesRead+" bytes"); } fis.close(); } Index: ReplayDetails.java =================================================================== RCS file: /cvsroot/swapdv/swapdv/ReplayServer/ReplayDetails.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ReplayDetails.java 4 Jun 2002 18:03:24 -0000 1.10 +++ ReplayDetails.java 11 Jun 2002 15:50:04 -0000 1.11 @@ -35,6 +35,7 @@ import java.net.InetAddress; import java.net.URL; import swapdv.Persistance.*; +import swapdv.Logger.*; public class ReplayDetails { public String Name = ""; @@ -110,7 +111,7 @@ } private void writeString(OutputStream os, String s) throws IOException { - //System.out.println("XML "+s); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "XML "+s); os.write(s.getBytes()); } Index: ReplayServer.java =================================================================== RCS file: /cvsroot/swapdv/swapdv/ReplayServer/ReplayServer.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ReplayServer.java 3 Jun 2002 23:03:03 -0000 1.12 +++ ReplayServer.java 11 Jun 2002 15:50:04 -0000 1.13 @@ -102,12 +102,12 @@ return; } Logger.log("WARNING: unhandled request"); - System.out.println("*** Unhandled request: "+req.request); + Logger.log(0, LoggerI.LEVEL_DEBUG, "*** Unhandled request: "+req.request); /*byte[] buffer = new byte[1024]; int n=1; while (n>0) { n = req.is.read(buffer); - if (n>0) System.out.println(new String(buffer,0,n)); + if (n>0) Logger.log(0, LoggerI.LEVEL_DEBUG, new String(buffer,0,n)); }*/ throw new Exception("Unhandled request: "+req.requestPath); } @@ -142,7 +142,7 @@ path = path.replace('/', File.separatorChar); // make slashes the right way around } // BUG? Trim double // off front, caused by bad ls return? - //System.out.println("Filename requested is "+path); + //Logger.log(0, LoggerI.LEVEL_DEBUG, "Filename requested is "+path); return path; } @@ -171,7 +171,7 @@ // Send it from memory if we have it if (guide != null) { - System.out.println("Returning guide from memory"); + Logger.log(0, LoggerI.LEVEL_DEBUG, "Returning guide from memory"); String guideStamp = String.valueOf(guide.getLastModifiedTime()/1000); if (guideStamp.equals(wantedGuide)) { Logger.log("Guide in memory is up-to-date"); @@ -191,11 +191,11 @@ if (lastfile==null) { //we DONT have a guide to return! //so pretend we've already returned this one earler... - System.out.println("WARNING: no guide found to return!"); + Logger.log(0, LoggerI.LEVEL_WARN, "no guide found to return!"); resp.writeBody("guide_file_name=upToDate\n"); // \n only } else { boolean found = false; - System.out.println("Most up-to-date guide "+lastfile+" being returned"); + Logger.log(0, LoggerI.LEVEL_DEBUG, "Most up-to-date guide "+lastfile+" being returned"); File f = new File(details.root+File.separatorChar+lastfile); String noext = lastfile.substring(0,lastfile.length()-4); if (noext.equals(wantedGuide)) { |
