- Only fail after all URLs are tried

- Move registration from servlet to manager and delay
- Fix plugin updates
- More logging
This commit is contained in:
zzz
2012-10-21 17:14:54 +00:00
parent 0fc452b683
commit 8b2889e317
8 changed files with 69 additions and 36 deletions

View File

@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletResponse;
import net.i2p.I2PAppContext;
import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
import net.i2p.update.*;
import net.i2p.util.I2PAppThread;
import net.i2p.util.Log;
@ -43,7 +42,6 @@ import org.klomp.snark.SnarkManager;
import org.klomp.snark.Storage;
import org.klomp.snark.Tracker;
import org.klomp.snark.TrackerClient;
import org.klomp.snark.UpdateHandler;
import org.klomp.snark.dht.DHT;
import org.mortbay.jetty.servlet.DefaultServlet;
@ -59,8 +57,6 @@ public class I2PSnarkServlet extends DefaultServlet {
private I2PAppContext _context;
private Log _log;
private SnarkManager _manager;
private UpdateManager _umgr;
private UpdateHandler _uhandler;
private static long _nonce;
private Resource _resourceBase;
private String _themePath;
@ -80,11 +76,6 @@ public class I2PSnarkServlet extends DefaultServlet {
configFile = "i2psnark.config";
_manager.loadConfig(configFile);
_manager.start();
_umgr = _context.updateManager();
if (_umgr != null) {
_uhandler = new UpdateHandler(_context, _umgr, _manager);
_umgr.register(_uhandler, UpdateType.ROUTER_SIGNED, UpdateMethod.TORRENT, 10);
}
try {
_resourceBase = Resource.newResource(_manager.getDataDir().getAbsolutePath());
} catch (IOException ioe) {}
@ -95,10 +86,6 @@ public class I2PSnarkServlet extends DefaultServlet {
public void destroy() {
if (_manager != null)
_manager.stop();
if (_umgr != null && _uhandler != null) {
//_uhandler.shutdown();
_umgr.unregister(_uhandler, UpdateType.ROUTER_SIGNED, UpdateMethod.TORRENT);
}
super.destroy();
}