goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the wait for client manager in the background thread, hopefully fixes #42

pull/53/head
Zlatin Balevsky 2020-03-30 13:28:22 +01:00
parent acb70f72d6
commit 293ff76ae9
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
webui/src/main/java/com/muwire/webui/MWStarter.java
View File

@ -1,29 +1,31 @@
package com.muwire.webui;
import java.io.File;
import com.muwire.core.Core;
import com.muwire.core.MuWireSettings;
import com.muwire.core.UILoadedEvent;
import net.i2p.I2PAppContext;
import net.i2p.router.RouterContext;
class MWStarter extends Thread {
private final MuWireSettings settings;
private final File home;
private final String version;
private final MuWireClient client;
private final Core core;
MWStarter(MuWireSettings settings, File home, String version, MuWireClient client) {
this.settings = settings;
this.home = home;
this.version = version;
this.client = client;
MWStarter(Core core) {
this.core = core;
setName("MW starter");
setDaemon(true);
}
public void run() {
Core core = new Core(settings, home, version);
client.setCore(core);
RouterContext ctx = (RouterContext) I2PAppContext.getGlobalContext();
while(!ctx.clientManager().isAlive()) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
core.startServices();
core.getEventBus().publish(new UILoadedEvent());
}

4
webui/src/main/java/com/muwire/webui/MuWireClient.java
View File

@ -92,7 +92,9 @@ public class MuWireClient {
reader.close();
MuWireSettings settings = new MuWireSettings(props);
MWStarter starter = new MWStarter(settings, new File(home), version, this);
Core core = new Core(settings, new File(home), version);
setCore(core);
MWStarter starter = new MWStarter(core);
starter.start();
}

13
webui/src/main/java/com/muwire/webui/MuWireServlet.java
View File

@ -21,17 +21,8 @@ public class MuWireServlet extends HttpServlet {
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
RouterContext ctx = (RouterContext) I2PAppContext.getGlobalContext();
while(!ctx.clientManager().isAlive()) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new ServletException(e);
}
}
RouterContext ctx = (RouterContext) I2PAppContext.getGlobalContext();
String home = ctx.getConfigDir()+File.separator+"plugins"+File.separator+"MuWire";
version = config.getInitParameter("version");