bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More or less properly shutdown client / network node

Browse Source
This commit is contained in:
Christian Basler
2015-04-17 13:01:46 +02:00
parent 8d7b9f6457
commit e611e5e20a
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
View File

@ -183,7 +183,7 @@ public class Connection implements Runnable {
}
}
private void disconnect() {
public void disconnect() {
try {
state = DISCONNECTED;
socket.close();

35
networking/src/main/java/ch/dissem/bitmessage/networking/NetworkNode.java
View File

@ -41,41 +41,34 @@ public class NetworkNode implements NetworkHandler {
private final static Logger LOG = LoggerFactory.getLogger(NetworkNode.class);
private final ExecutorService pool;
private final List<Connection> connections = new LinkedList<>();
private MessageListener listener;
private ServerSocket serverSocket;
private Thread connectionManager;
public NetworkNode() {
pool = Executors.newCachedThreadPool();
}
@Override
public void setListener(final MessageListener listener) {
if (this.listener != null) {
throw new IllegalStateException("Listener can only be set once");
}
this.listener = listener;
}
@Override
public void start() {
public void start(final MessageListener listener) {
final Context ctx = Context.getInstance();
if (listener == null) {
throw new IllegalStateException("Listener must be set at start");
}
try {
final ServerSocket serverSocket = new ServerSocket(Context.getInstance().getPort());
serverSocket = new ServerSocket(Context.getInstance().getPort());
pool.execute(new Runnable() {
@Override
public void run() {
try {
Socket socket = serverSocket.accept();
socket.setSoTimeout(20000);
socket.setSoTimeout(10000);
startConnection(new Connection(SERVER, socket, listener));
} catch (IOException e) {
LOG.debug(e.getMessage(), e);
}
}
});
Thread connectionManager = new Thread(new Runnable() {
connectionManager = new Thread(new Runnable() {
@Override
public void run() {
while (!Thread.interrupted()) {
@ -114,6 +107,22 @@ public class NetworkNode implements NetworkHandler {
}
}
@Override
public void stop() {
connectionManager.interrupt();
try {
serverSocket.close();
} catch (IOException e) {
LOG.debug(e.getMessage(), e);
}
synchronized (connections) {
for (Connection c : connections) {
c.disconnect();
}
}
pool.shutdownNow();
}
private void startConnection(Connection c) {
synchronized (connections) {
connections.add(c);