On the windows platform, there is a small application to sit in the system
tray, allowing you to view the router's status (later on, I2P client applications
@@ -50,7 +51,8 @@
Debugging
At times, it may be helpful to debug I2P by getting a thread dump. To do so,
- please select the following option and review the thread dumped to logs/wrapper.log.
+ please select the following option and review the thread dumped to
+logs/wrapper.log.
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index f46f2c7d6..10b61c115 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -13,7 +13,11 @@
" />
+
Router logs:
+
+
Service logs:
+
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 738d84bc0..0c4f6e3bd 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -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) {}
+ }
+ }
}
diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java
index 88d89da74..b4bd8d740 100644
--- a/core/java/src/net/i2p/util/I2PThread.java
+++ b/core/java/src/net/i2p/util/I2PThread.java
@@ -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) {
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 2459b715e..bf267b657 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -539,6 +539,7 @@ public class Router {
public static final int EXIT_GRACEFUL = 2;
public static final int EXIT_HARD = 3;
public static final int EXIT_OOM = 10;
+ public static final int EXIT_HARD_RESTART = 4;
public void shutdown(int exitCode) {
_isAlive = false;