I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

updated to handle operation without a logger.config (reasonably)

Browse Source
This commit is contained in:
jrandom
2004-08-01 23:27:37 +00:00
committed by zzz
parent 3a61d260d7
commit 8d8b6da0bf
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,18 +48,18 @@ public class LogManager {
public final static String PROP_DISPLAYONSCREEN = "logger.displayOnScreen"; public final static String PROP_DISPLAYONSCREEN = "logger.displayOnScreen";
public final static String PROP_CONSOLEBUFFERSIZE = "logger.consoleBufferSize"; public final static String PROP_CONSOLEBUFFERSIZE = "logger.consoleBufferSize";
public final static String PROP_DISPLAYONSCREENLEVEL = "logger.minimumOnScreenLevel"; public final static String PROP_DISPLAYONSCREENLEVEL = "logger.minimumOnScreenLevel";
public final static String PROP_DEFALTLEVEL = "logger.defaultLevel"; public final static String PROP_DEFAULTLEVEL = "logger.defaultLevel";
public final static String PROP_RECORD_PREFIX = "logger.record."; public final static String PROP_RECORD_PREFIX = "logger.record.";
public final static String DEFAULT_FORMAT = DATE + ' ' + PRIORITY + " [" + THREAD + "] " + CLASS + ": " + MESSAGE; public final static String DEFAULT_FORMAT = DATE + " " + PRIORITY + " [" + THREAD + "] " + CLASS + ": " + MESSAGE;
public final static String DEFAULT_DATEFORMAT = "hh:mm:ss.SSS"; public final static String DEFAULT_DATEFORMAT = "HH:mm:ss.SSS";
public final static String DEFAULT_FILENAME = "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;
public final static String DEFAULT_ROTATIONLIMIT = "2"; public final static String DEFAULT_ROTATIONLIMIT = "2";
public final static String DEFAULT_DEFALTLEVEL = Log.STR_DEBUG; public final static String DEFAULT_DEFAULTLEVEL = Log.STR_ERROR;
public final static String DEFAULT_ONSCREENLEVEL = Log.STR_DEBUG; public final static String DEFAULT_ONSCREENLEVEL = Log.STR_ERROR;
private I2PAppContext _context; private I2PAppContext _context;
private Log _log; private Log _log;
@ -105,12 +105,15 @@ public class LogManager {
/** the actual "recent logs" list */ /** the actual "recent logs" list */
private LogConsoleBuffer _consoleBuffer; private LogConsoleBuffer _consoleBuffer;
private boolean _alreadyNoticedMissingConfig;
public LogManager(I2PAppContext context) { public LogManager(I2PAppContext context) {
_displayOnScreen = true; _displayOnScreen = true;
_alreadyNoticedMissingConfig = false;
_records = new ArrayList(); _records = new ArrayList();
_limits = new ArrayList(128); _limits = new ArrayList(128);
_logs = new HashMap(128); _logs = new HashMap(128);
_defaultLimit = Log.DEBUG; _defaultLimit = Log.ERROR;
_configLastRead = 0; _configLastRead = 0;
_location = context.getProperty(CONFIG_LOCATION_PROP, CONFIG_LOCATION_DEFAULT); _location = context.getProperty(CONFIG_LOCATION_PROP, CONFIG_LOCATION_DEFAULT);
_context = context; _context = context;
@ -217,7 +220,8 @@ public class LogManager {
*/ */
void rereadConfig() { void rereadConfig() {
// perhaps check modification time // perhaps check modification time
_log.debug("Rereading configuration file"); if (_log.shouldLog(Log.DEBUG))
_log.debug("Rereading configuration file");
loadConfig(); loadConfig();
} }
@ -230,6 +234,19 @@ public class LogManager {
private void loadConfig() { private void loadConfig() {
File cfgFile = new File(_location); File cfgFile = new File(_location);
if (!cfgFile.exists()) {
if (!_alreadyNoticedMissingConfig) {
if (_log.shouldLog(Log.ERROR))
_log.error("Log file " + _location + " does not exist");
System.err.println("Log file " + _location + " does not exist");
_alreadyNoticedMissingConfig = true;
}
parseConfig(new Properties());
updateLimits();
return;
}
_alreadyNoticedMissingConfig = false;
if ((_configLastRead > 0) && (_configLastRead >= cfgFile.lastModified())) { if ((_configLastRead > 0) && (_configLastRead >= cfgFile.lastModified())) {
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Short circuiting config read (last read: " _log.info("Short circuiting config read (last read: "
@ -260,7 +277,7 @@ public class LogManager {
} }
private void parseConfig(Properties config) { private void parseConfig(Properties config) {
String fmt = config.getProperty(PROP_FORMAT, new String(DEFAULT_FORMAT)); String fmt = config.getProperty(PROP_FORMAT, DEFAULT_FORMAT);
_format = fmt.toCharArray(); _format = fmt.toCharArray();
String df = config.getProperty(PROP_DATEFORMAT, DEFAULT_DATEFORMAT); String df = config.getProperty(PROP_DATEFORMAT, DEFAULT_DATEFORMAT);
@ -289,13 +306,13 @@ public class LogManager {
_rotationLimit = -1; _rotationLimit = -1;
try { try {
String str = config.getProperty(PROP_ROTATIONLIMIT); String str = config.getProperty(PROP_ROTATIONLIMIT);
if (str == null) System.err.println("Rotation limit not specified");
_rotationLimit = Integer.parseInt(config.getProperty(PROP_ROTATIONLIMIT, DEFAULT_ROTATIONLIMIT)); _rotationLimit = Integer.parseInt(config.getProperty(PROP_ROTATIONLIMIT, DEFAULT_ROTATIONLIMIT));
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
System.err.println("Invalid rotation limit"); System.err.println("Invalid rotation limit");
nfe.printStackTrace(); nfe.printStackTrace();
} }
_defaultLimit = Log.getLevel(config.getProperty(PROP_DEFALTLEVEL, DEFAULT_DEFALTLEVEL));
_defaultLimit = Log.getLevel(config.getProperty(PROP_DEFAULTLEVEL, DEFAULT_DEFAULTLEVEL));
_onScreenLimit = Log.getLevel(config.getProperty(PROP_DISPLAYONSCREENLEVEL, DEFAULT_ONSCREENLEVEL)); _onScreenLimit = Log.getLevel(config.getProperty(PROP_DISPLAYONSCREENLEVEL, DEFAULT_ONSCREENLEVEL));
@ -542,7 +559,7 @@ public class LogManager {
// if <= 0, dont specify // if <= 0, dont specify
buf.append(PROP_ROTATIONLIMIT).append('=').append(_rotationLimit).append('\n'); buf.append(PROP_ROTATIONLIMIT).append('=').append(_rotationLimit).append('\n');
buf.append(PROP_DEFALTLEVEL).append('=').append(Log.toLevelString(_defaultLimit)).append('\n'); buf.append(PROP_DEFAULTLEVEL).append('=').append(Log.toLevelString(_defaultLimit)).append('\n');
buf.append(PROP_DISPLAYONSCREENLEVEL).append('=').append(Log.toLevelString(_onScreenLimit)).append('\n'); buf.append(PROP_DISPLAYONSCREENLEVEL).append('=').append(Log.toLevelString(_onScreenLimit)).append('\n');
buf.append(PROP_CONSOLEBUFFERSIZE).append('=').append(_consoleBufferSize).append('\n'); buf.append(PROP_CONSOLEBUFFERSIZE).append('=').append(_consoleBufferSize).append('\n');