From 97460e7d99b6c0ce80438816a092317dde583d5c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 6 Oct 2012 13:42:48 +0000
Subject: [PATCH] * configlogging.jsp: Fix IAE * error500.jsp: Fix whitespace
---
apps/routerconsole/jsp/error500.jsp | 1 -
core/java/src/net/i2p/util/LogManager.java | 9 +++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp
index 2b420e4f6d..2ffeadff87 100644
--- a/apps/routerconsole/jsp/error500.jsp
+++ b/apps/routerconsole/jsp/error500.jsp
@@ -1,5 +1,4 @@
<%@page contentType="text/html"%>
-<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<%
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index cf6cb9593c..b166aa9eae 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -66,7 +66,7 @@ public class LogManager {
//public final static String DEFAULT_DATEFORMAT = "HH:mm:ss.SSS";
/** blank means default short date and medium time for the locale - see 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 boolean DEFAULT_DISPLAYONSCREEN = true;
public final static int DEFAULT_CONSOLEBUFFERSIZE = 20;
@@ -349,9 +349,9 @@ public class LogManager {
String filenameOverride = _context.getProperty(FILENAME_OVERRIDE_PROP);
if (filenameOverride != null)
- _baseLogfilename = filenameOverride;
+ setBaseLogfilename(filenameOverride);
else
- _baseLogfilename = config.getProperty(PROP_FILENAME, DEFAULT_FILENAME);
+ setBaseLogfilename(config.getProperty(PROP_FILENAME, DEFAULT_FILENAME));
_fileSize = getFileSize(config.getProperty(PROP_FILESIZE, DEFAULT_FILESIZE));
_rotationLimit = -1;
@@ -591,7 +591,8 @@ public class LogManager {
}
public void setBaseLogfilename(String filenamePattern) {
- _baseLogfilename = filenamePattern;
+ // '#' is a comment character in loadProps/storeProps
+ _baseLogfilename = filenamePattern.replace('#', '@');
}
public int getFileSize() {
--
GitLab