echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* configlogging.jsp: Fix IAE

Browse Source 
* error500.jsp: Fix whitespace
This commit is contained in:
zzz
2012-10-06 13:42:48 +00:00
parent ddc750469c
commit 97460e7d99
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/routerconsole/jsp/error500.jsp
View File

@ -1,5 +1,4 @@
<%@page contentType="text/html"%> <%@page contentType="text/html"%>
<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<% <%

9
core/java/src/net/i2p/util/LogManager.java
View File

@ -66,7 +66,7 @@ public class LogManager {
//public final static String DEFAULT_DATEFORMAT = "HH:mm:ss.SSS"; //public final static String DEFAULT_DATEFORMAT = "HH:mm:ss.SSS";
/** blank means default short date and medium time for the locale - see DateFormat */ /** blank means default short date and medium time for the locale - see DateFormat */
public final static String DEFAULT_DATEFORMAT = ""; public final static String DEFAULT_DATEFORMAT = "";
public final static String DEFAULT_FILENAME = "logs/log-#.txt"; public final static String DEFAULT_FILENAME = "logs/log-@.txt";
public final static String DEFAULT_FILESIZE = "10m"; public final static String DEFAULT_FILESIZE = "10m";
public final static boolean DEFAULT_DISPLAYONSCREEN = true; public final static boolean DEFAULT_DISPLAYONSCREEN = true;
public final static int DEFAULT_CONSOLEBUFFERSIZE = 20; public final static int DEFAULT_CONSOLEBUFFERSIZE = 20;
@ -349,9 +349,9 @@ public class LogManager {
String filenameOverride = _context.getProperty(FILENAME_OVERRIDE_PROP); String filenameOverride = _context.getProperty(FILENAME_OVERRIDE_PROP);
if (filenameOverride != null) if (filenameOverride != null)
_baseLogfilename = filenameOverride; setBaseLogfilename(filenameOverride);
else else
_baseLogfilename = config.getProperty(PROP_FILENAME, DEFAULT_FILENAME); setBaseLogfilename(config.getProperty(PROP_FILENAME, DEFAULT_FILENAME));
_fileSize = getFileSize(config.getProperty(PROP_FILESIZE, DEFAULT_FILESIZE)); _fileSize = getFileSize(config.getProperty(PROP_FILESIZE, DEFAULT_FILESIZE));
_rotationLimit = -1; _rotationLimit = -1;
@ -591,7 +591,8 @@ public class LogManager {
} }
public void setBaseLogfilename(String filenamePattern) { public void setBaseLogfilename(String filenamePattern) {
_baseLogfilename = filenamePattern; // '#' is a comment character in loadProps/storeProps
_baseLogfilename = filenamePattern.replace('#', '@');
} }
public int getFileSize() { public int getFileSize() {