2005-12-18 jrandom

* Added a standalone runner for the I2PSnark web ui (build with the
      command "ant i2psnark", unzip i2psnark-standalone.zip somewhere, run
      with "java -jar launch-i2psnark.jar", and go to http://localhost:8002/).
    * Further I2PSnark error handling

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

@@ -192,6 +192,15 @@ public class I2PSnarkUtil {
     
     /** hook between snark's logger and an i2p log */
     void debug(String msg, int snarkDebugLevel, Throwable t) {
+        if (t instanceof OutOfMemoryError) {
+            try { Thread.sleep(100); } catch (InterruptedException ie) {}
+            try {
+                t.printStackTrace();
+            } catch (Throwable tt) {}
+            try {
+                System.out.println("OOM thread: " + Thread.currentThread().getName());
+            } catch (Throwable tt) {}
+        }
         switch (snarkDebugLevel) {
             case 0:
             case 1:

apps/i2psnark/java/src/org/klomp/snark/Peer.java

@@ -283,6 +283,9 @@ public class Peer implements Comparable
         PeerConnectionOut out = s.out;
         if (out != null)
           out.disconnect();
+        PeerListener pl = s.listener;
+        if (pl != null)
+          pl.disconnected(this);
       }
   }
 

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java

@@ -172,8 +172,9 @@ class PeerConnectionIn implements Runnable
       }
     catch (Throwable t)
       {
-        Snark.debug(peer + ": " + t, Snark.ERROR);
-        t.printStackTrace();
+        I2PSnarkUtil.instance().debug(peer.toString(), Snark.ERROR, t);
+        if (t instanceof OutOfMemoryError)
+            throw (OutOfMemoryError)t;
       }
     finally
       {

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java

@@ -62,13 +62,13 @@ class PeerConnectionOut implements Runnable
   {
     try
       {
-        while (!quit)
+        while (!quit && peer.isConnected())
           {
             Message m = null;
             PeerState state = null;
             synchronized(sendQueue)
               {
-                while (!quit && sendQueue.isEmpty())
+                while (!quit && peer.isConnected() && sendQueue.isEmpty())
                   {
                     try
                       {
@@ -86,7 +86,7 @@ class PeerConnectionOut implements Runnable
                       }
                   }
                 state = peer.state;
-                if (!quit && state != null)
+                if (!quit && state != null && peer.isConnected())
                   {
                     // Piece messages are big. So if there are other
                     // (control) messages make sure they are send first.
@@ -149,8 +149,9 @@ class PeerConnectionOut implements Runnable
       }
     catch (Throwable t)
       {
-        Snark.debug(peer + ": "  + t, Snark.ERROR);
-        t.printStackTrace();
+        I2PSnarkUtil.instance().debug(peer.toString(), Snark.ERROR, t);
+        if (t instanceof OutOfMemoryError)
+            throw (OutOfMemoryError)t;
       }
     finally
       {

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java

@@ -536,8 +536,8 @@ public class PeerCoordinator implements PeerListener
 
   public void disconnected(Peer peer)
   {
-    if (Snark.debug >= Snark.INFO)
-      Snark.debug("Disconnected " + peer, Snark.INFO);
+    if (_log.shouldLog(Log.INFO))
+        _log.info("Disconnected " + peer);
     
     synchronized(peers)
       {

apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

@@ -231,8 +231,9 @@ public class TrackerClient extends I2PThread
       }
     catch (Throwable t)
       {
-        Snark.debug("TrackerClient: " + t, Snark.ERROR);
-        t.printStackTrace();
+        I2PSnarkUtil.instance().debug("TrackerClient: " + t, Snark.ERROR, t);
+        if (t instanceof OutOfMemoryError)
+            throw (OutOfMemoryError)t;
       }
     finally
       {

apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java

@@ -0,0 +1,47 @@
+package org.klomp.snark.web;
+
+import java.io.File;
+
+import net.i2p.util.FileUtil;
+import org.mortbay.jetty.Server;
+
+public class RunStandalone {
+    private Server _server;
+    
+    static {
+        System.setProperty("org.mortbay.http.Version.paranoid", "true");
+        System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
+    }
+    
+    private RunStandalone(String args[]) {}
+    
+    public static void main(String args[]) {
+        RunStandalone runner = new RunStandalone(args);
+        runner.start();
+    }
+    
+    public void start() {
+        File workDir = new File("work");
+        boolean workDirRemoved = FileUtil.rmdir(workDir, false);
+        if (!workDirRemoved)
+            System.err.println("ERROR: Unable to remove Jetty temporary work directory");
+        boolean workDirCreated = workDir.mkdirs();
+        if (!workDirCreated)
+            System.err.println("ERROR: Unable to create Jetty temporary work directory");
+        
+        try {
+            _server = new Server("jetty-i2psnark.xml");
+            _server.start();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public void stop() {
+        try {
+            _server.stop();
+        } catch (InterruptedException ie) {
+            ie.printStackTrace();
+        }
+    }
+}