From ae3c79c40fd52c0e1b2ece50922cde1f2f71f358 Mon Sep 17 00:00:00 2001
From: Napster <napster@npstr.space>
Date: Thu, 21 Sep 2017 03:35:10 +0200
Subject: [PATCH] Fix null info in logs

---
 .gitignore                                                | 1 +
 .../src/main/java/lavalink/client/io/LavalinkSocket.java  | 8 ++++----
 .../main/java/lavalink/client/io/ReusableWebSocket.java   | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6577ead9f..40a84d7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /logs/
 /target/
 /application.yml
+*/dependency-reduced-pom.xml
diff --git a/LavalinkClient/src/main/java/lavalink/client/io/LavalinkSocket.java b/LavalinkClient/src/main/java/lavalink/client/io/LavalinkSocket.java
index b070037f8..5837afc15 100644
--- a/LavalinkClient/src/main/java/lavalink/client/io/LavalinkSocket.java
+++ b/LavalinkClient/src/main/java/lavalink/client/io/LavalinkSocket.java
@@ -201,9 +201,9 @@ public void onClose(int code, String reason, boolean remote) {
         available = false;
         reason = reason == null ? "<no reason given>" : reason;
         if (code == 1000) {
-            log.info("Connection to " + getRemoteSocketAddress() + " closed gracefully with reason: " + reason + " :: Remote=" + remote);
+            log.info("Connection to " + getRemoteUri() + " closed gracefully with reason: " + reason + " :: Remote=" + remote);
         } else {
-            log.warn("Connection to " + getRemoteSocketAddress() + " closed unexpectedly with reason " + code + ": " + reason + " :: Remote=" + remote);
+            log.warn("Connection to " + getRemoteUri() + " closed unexpectedly with reason " + code + ": " + reason + " :: Remote=" + remote);
         }
 
         lavalink.loadBalancer.onNodeDisconnect(this);
@@ -212,7 +212,7 @@ public void onClose(int code, String reason, boolean remote) {
     @Override
     public void onError(Exception ex) {
         if (ex instanceof ConnectException) {
-            log.warn("Failed to connect to " + getRemoteSocketAddress() + ", retrying in " + getReconnectInterval()/1000 + " seconds.");
+            log.warn("Failed to connect to " + getRemoteUri() + ", retrying in " + getReconnectInterval()/1000 + " seconds.");
             return;
         }
 
@@ -225,7 +225,7 @@ public void send(String text) throws NotYetConnectedException {
         if (isOpen()) {
             super.send(text);
         } else if (isConnecting()) {
-            log.warn("Attempting to send messages to " + getRemoteSocketAddress() + " WHILE connecting. Ignoring.");
+            log.warn("Attempting to send messages to " + getRemoteUri() + " WHILE connecting. Ignoring.");
         }
     }
 
diff --git a/LavalinkClient/src/main/java/lavalink/client/io/ReusableWebSocket.java b/LavalinkClient/src/main/java/lavalink/client/io/ReusableWebSocket.java
index 39c13f057..7d2b8de66 100644
--- a/LavalinkClient/src/main/java/lavalink/client/io/ReusableWebSocket.java
+++ b/LavalinkClient/src/main/java/lavalink/client/io/ReusableWebSocket.java
@@ -65,6 +65,11 @@ public void send(String text) {
         }
     }
 
+    public URI getServerUri() {
+        return this.serverUri;
+    }
+
+    //will return null if there is no connection
     public InetSocketAddress getRemoteSocketAddress() {
         return socket.getRemoteSocketAddress();
     }