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

* helper to read the last few lines of a textfile

Browse Source 
* use that to render the last few lines of the wrapper log on /logs.jsp (for the on demand stack trace)
* thread creation / finalization logging
* support a hard restart (stop immediately and restart the JVM) - useful for rerunning clients.config (etc)
* systray when not supported
This commit is contained in:
jrandom
2004-08-24 18:02:48 +00:00
committed by zzz
parent 71577c9b0e
commit e81c1df19f
7 changed files with 92 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/src/net/i2p/data/DataHelper.java
View File

@ -606,4 +606,34 @@ public class DataHelper {
// * (((double) rv.length) / ((double) orig.length)) + "% savings)");
return rv;
}
/**
* Read in the last few lines of a (newline delimited) textfile, or null if
* the file doesn't exist.
*
*/
public static String readTextFile(String filename, int maxNumLines) {
File f = new File(filename);
if (!f.exists()) return null;
FileInputStream fis = null;
try {
fis = new FileInputStream(f);
BufferedReader in = new BufferedReader(new InputStreamReader(fis));
List lines = new ArrayList(maxNumLines);
String line = null;
while ( (line = in.readLine()) != null) {
lines.add(line);
while (lines.size() > maxNumLines)
lines.remove(0);
}
StringBuffer buf = new StringBuffer(lines.size() * 80);
for (int i = 0; i < lines.size(); i++)
buf.append((String)lines.get(i)).append('\n');
return buf.toString();
} catch (IOException ioe) {
return null;
} finally {
if (fis != null) try { fis.close(); } catch (IOException ioe) {}
}
}
}

32
core/java/src/net/i2p/util/I2PThread.java
View File

@ -20,33 +20,51 @@ import java.util.Set;
*
*/
public class I2PThread extends Thread {
private static Log _log;
private static volatile Log _log;
private static Set _listeners = new HashSet(4);
private String _name;
private Exception _createdBy;
public I2PThread() {
super();
if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
_createdBy = new Exception("Created by");
}
public I2PThread(String name) {
super(name);
if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
_createdBy = new Exception("Created by");
}
public I2PThread(Runnable r) {
super(r);
if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
_createdBy = new Exception("Created by");
}
public I2PThread(Runnable r, String name) {
super(r, name);
if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
_createdBy = new Exception("Created by");
}
private void log(int level, String msg) { log(level, msg, null); }
private void log(int level, String msg, Throwable t) {
// we cant assume log is created
if (_log == null) _log = new Log(I2PThread.class);
if (_log.shouldLog(level))
_log.log(level, msg, t);
}
public void run() {
_name = Thread.currentThread().getName();
log(Log.DEBUG, "New thread started: " + _name, _createdBy);
try {
super.run();
} catch (Throwable t) {
try {
// we cant assume log is created
if (_log == null) _log = new Log(I2PThread.class);
_log.log(Log.CRIT, "Killing thread " + getName(), t);
log(Log.CRIT, "Killing thread " + getName(), t);
} catch (Throwable woof) {
System.err.println("Died within the OOM itself");
t.printStackTrace();
@ -54,6 +72,12 @@ public class I2PThread extends Thread {
if (t instanceof OutOfMemoryError)
fireOOM((OutOfMemoryError)t);
}
log(Log.DEBUG, "Thread finished gracefully: " + _name);
}
protected void finalize() throws Throwable {
log(Log.DEBUG, "Thread finalized: " + _name);
super.finalize();
}
private void fireOOM(OutOfMemoryError oom) {