mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add missing master thread

Browse Source
This commit is contained in:
Manfred Karrer 2016-07-19 16:27:59 +02:00
parent 59ce63471f
commit 9f22fe2450
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
headless/src/main/java/io/bitsquare/headless/HeadlessMain.java
View File

@ -17,8 +17,10 @@
package io.bitsquare.headless;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.BitsquareExecutable;
import io.bitsquare.common.UserThread;
import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
@ -26,6 +28,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Scanner;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import static io.bitsquare.app.BitsquareEnvironment.*;
@ -35,9 +39,14 @@ public class HeadlessMain extends BitsquareExecutable {
private boolean isStopped;
public static void main(String[] args) throws Exception {
final ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setNameFormat("HeadlessMain")
.setDaemon(true)
.build();
UserThread.setExecutor(Executors.newSingleThreadExecutor(threadFactory));
// We don't want to do the full argument parsing here as that might easily change in update versions
// So we only handle the absolute minimum which is APP_NAME, APP_DATA_DIR_KEY and USER_DATA_DIR
BitsquareEnvironment.setDefaultAppName("Bitsquare_headless");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
@ -71,7 +80,7 @@ public class HeadlessMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
Headless.setEnvironment(new BitsquareEnvironment(options));
headless = new Headless();
UserThread.execute(() -> headless = new Headless());
while (!isStopped) {
try {
@ -79,7 +88,7 @@ public class HeadlessMain extends BitsquareExecutable {
while (scanner.hasNextLine()) {
String inputString = scanner.nextLine();
if (inputString.equals("q")) {
headless.shutDown();
UserThread.execute(headless::shutDown);
isStopped = true;
}
}

15
monitor/src/main/java/io/bitsquare/monitor/MonitorMain.java
View File

@ -17,8 +17,10 @@
package io.bitsquare.monitor;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.BitsquareExecutable;
import io.bitsquare.common.UserThread;
import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
@ -26,6 +28,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Scanner;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import static io.bitsquare.app.BitsquareEnvironment.*;
@ -35,9 +39,14 @@ public class MonitorMain extends BitsquareExecutable {
private boolean isStopped;
public static void main(String[] args) throws Exception {
final ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setNameFormat("MonitorMain")
.setDaemon(true)
.build();
UserThread.setExecutor(Executors.newSingleThreadExecutor(threadFactory));
// We don't want to do the full argument parsing here as that might easily change in update versions
// So we only handle the absolute minimum which is APP_NAME, APP_DATA_DIR_KEY and USER_DATA_DIR
BitsquareEnvironment.setDefaultAppName("Bitsquare_monitor");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
@ -71,7 +80,7 @@ public class MonitorMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
Monitor.setEnvironment(new BitsquareEnvironment(options));
monitor = new Monitor();
UserThread.execute(() -> monitor = new Monitor());
while (!isStopped) {
try {
@ -79,7 +88,7 @@ public class MonitorMain extends BitsquareExecutable {
while (scanner.hasNextLine()) {
String inputString = scanner.nextLine();
if (inputString.equals("q")) {
monitor.shutDown();
UserThread.execute(monitor::shutDown);
isStopped = true;
}
}

17
seednode/src/main/java/io/bitsquare/seednode/SeedNodeMain.java
View File

@ -17,8 +17,10 @@
package io.bitsquare.seednode;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.BitsquareExecutable;
import io.bitsquare.common.UserThread;
import joptsimple.OptionException;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
@ -26,6 +28,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Scanner;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import static io.bitsquare.app.BitsquareEnvironment.*;
@ -35,10 +39,15 @@ public class SeedNodeMain extends BitsquareExecutable {
private boolean isStopped;
public static void main(String[] args) throws Exception {
final ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setNameFormat("SeedNodeMain")
.setDaemon(true)
.build();
UserThread.setExecutor(Executors.newSingleThreadExecutor(threadFactory));
// We don't want to do the full argument parsing here as that might easily change in update versions
// So we only handle the absolute minimum which is APP_NAME, APP_DATA_DIR_KEY and USER_DATA_DIR
BitsquareEnvironment.setDefaultAppName("Bitsquare_bootstrap");
BitsquareEnvironment.setDefaultAppName("Bitsquare_seednode");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
parser.accepts(USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
@ -71,7 +80,7 @@ public class SeedNodeMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
SeedNode.setEnvironment(new BitsquareEnvironment(options));
seedNode = new SeedNode();
UserThread.execute(() -> seedNode = new SeedNode());
while (!isStopped) {
try {
@ -79,7 +88,7 @@ public class SeedNodeMain extends BitsquareExecutable {
while (scanner.hasNextLine()) {
String inputString = scanner.nextLine();
if (inputString.equals("q")) {
seedNode.shutDown();
UserThread.execute(seedNode::shutDown);
isStopped = true;
}
}