Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'speedtest_logging' into 'master'

Browse Source 
improved logging for ping

See merge request sheepitrenderfarm/client!102
This commit is contained in:
Sheepit Renderfarm
2022-02-19 14:58:25 +00:00
parent 4c7305dd8c 413eb798d6
commit 68dfb4d419
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/sheepit/client/Speedtest.java
View File

@@ -125,14 +125,16 @@ public class Speedtest {
} }
private static int ping(String url, int port) { private static int ping(String url, int port) {
InetAddress mirrorIP = null;
try (Socket socket = new Socket()) { try (Socket socket = new Socket()) {
InetAddress mirrorIP = InetAddress.getByName(new URL(url).getHost()); mirrorIP = InetAddress.getByName(new URL(url).getHost());
SocketAddress socketAddress = new InetSocketAddress(mirrorIP, port); SocketAddress socketAddress = new InetSocketAddress(mirrorIP, port);
int maxWaitingTime_ms = 3000; int maxWaitingTime_ms = 3000;
socket.connect(socketAddress, maxWaitingTime_ms); socket.connect(socketAddress, maxWaitingTime_ms);
} }
catch (IOException e) { catch (IOException e) {
throw new RuntimeException("Unable to connect to " + url + ":" + port, e); String problemURL = mirrorIP != null ? mirrorIP + " (derived from: " + url + ")" : url;
throw new RuntimeException("Unable to connect to " + problemURL, e);
} }
return -1; return -1;
} }