Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-12-16 00:04:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups, improve loggings

Browse source
This commit is contained in:
Manfred Karrer 2016-02-01 13:26:41 +01:00
parent 186f85c44e
commit bee9d2c610
30 changed files with 200 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

10
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OnionProxyManager.java
View file

@ -43,7 +43,7 @@ import java.nio.file.attribute.PosixFilePermission;
import java.util.*;
import java.util.concurrent.CountDownLatch;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
/**
* This is where all the fun is, this is the class that handles the heavy work.
@ -62,8 +62,8 @@ public abstract class OnionProxyManager {
private static final String[] EVENTS_HS = {"EXTENDED", "CIRC", "ORCONN", "INFO", "NOTICE", "WARN", "ERR", "HS_DESC"};
private static final String OWNER = "__OwningControllerProcess";
private static final int COOKIE_TIMEOUT = 3 * 1000; // Milliseconds
private static final int HOSTNAME_TIMEOUT = 30 * 1000; // Milliseconds
private static final long COOKIE_TIMEOUT_IN_SEC = 10;
private static final long HOSTNAME_TIMEOUT_IN_SEC = 30;
private static final Logger LOG = LoggerFactory.getLogger(OnionProxyManager.class);
protected final OnionProxyContext onionProxyContext;
@ -247,7 +247,7 @@ public abstract class OnionProxyManager {
controlConnection.setConf(config);
controlConnection.saveConf();
// Wait for the hostname file to be created/updated
if (!hostNameFileObserver.poll(HOSTNAME_TIMEOUT, MILLISECONDS)) {
if (!hostNameFileObserver.poll(HOSTNAME_TIMEOUT_IN_SEC, SECONDS)) {
FileUtilities.listFilesToLog(hostnameFile.getParentFile());
throw new RuntimeException("Wait for hidden service hostname file to be created expired.");
}
@ -455,7 +455,7 @@ public abstract class OnionProxyManager {
}
// Wait for the auth cookie file to be created/updated
if (!cookieObserver.poll(COOKIE_TIMEOUT, MILLISECONDS)) {
if (!cookieObserver.poll(COOKIE_TIMEOUT_IN_SEC, SECONDS)) {
LOG.warn("Auth cookie not created");
FileUtilities.listFilesToLog(workingDirectory);
return false;

2
jtorproxy/src/main/java/io/nucleo/net/Node.java
View file

@ -219,7 +219,7 @@ public class Node {
public void run() {
{
try {
socket.setSoTimeout(60 * 1000);
socket.setSoTimeout((int) TimeUnit.SECONDS.toMillis(60));
} catch (SocketException e2) {
e2.printStackTrace();
try {