Skip to content

Commit 4428c5d

Browse files
committed
Add extra logs
1 parent d4b9043 commit 4428c5d

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
3131
@NonNull
3232
@Override
3333
public Observable<String> messages() {
34+
Log.d(TAG, "messages()");
3435
return mMessagesStream.startWith(initSocket().toObservable());
3536
}
3637

@@ -51,6 +52,7 @@ public Completable disconnect() {
5152
}
5253

5354
private Completable initSocket() {
55+
Log.d(TAG, "innitSocket");
5456
return Completable
5557
.fromAction(this::createWebSocketConnection);
5658
}

lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ua.naiksoftware.stomp;
22

3+
import android.nfc.Tag;
34
import android.support.annotation.NonNull;
45
import android.support.annotation.Nullable;
56
import android.util.Log;
@@ -18,11 +19,12 @@
1819

1920
class OkHttpConnectionProvider extends AbstractConnectionProvider {
2021

22+
public static final String TAG = "OkHttpConnProvider";
23+
2124
private final String mUri;
2225
@NonNull
2326
private final Map<String, String> mConnectHttpHeaders;
2427
private final OkHttpClient mOkHttpClient;
25-
private final String tag = OkHttpConnectionProvider.class.getSimpleName();
2628

2729
@Nullable
2830
private WebSocket openedSocked;
@@ -44,6 +46,7 @@ public void rawDisconnect() {
4446

4547
@Override
4648
void createWebSocketConnection() {
49+
Log.d(TAG, "createWebSocketConnection");
4750
Request.Builder requestBuilder = new Request.Builder()
4851
.url(mUri);
4952

@@ -53,6 +56,7 @@ void createWebSocketConnection() {
5356
new WebSocketListener() {
5457
@Override
5558
public void onOpen(WebSocket webSocket, @NonNull Response response) {
59+
Log.d(TAG, "onOpen");
5660
LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
5761

5862
TreeMap<String, String> headersAsMap = headersAsMap(response);
@@ -64,7 +68,7 @@ public void onOpen(WebSocket webSocket, @NonNull Response response) {
6468
@Override
6569
public void onMessage(WebSocket webSocket, String text) {
6670
if (text.equals("\n"))
67-
Log.d(tag, "RECEIVED HEARTBEAT");
71+
Log.d(TAG, "RECEIVED HEARTBEAT");
6872
else
6973
emitMessage(text);
7074
}
@@ -76,25 +80,29 @@ public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
7680

7781
@Override
7882
public void onClosed(WebSocket webSocket, int code, String reason) {
83+
Log.d(TAG, "onClosed (nullify socket)");
7984
openedSocked = null;
8085
emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
8186
}
8287

8388
@Override
8489
public void onFailure(WebSocket webSocket, Throwable t, Response response) {
8590
// in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
91+
Log.d(TAG, "onFailure (nullify socket)");
8692
emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
8793
openedSocked = null;
8894
emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
8995
}
9096

9197
@Override
9298
public void onClosing(final WebSocket webSocket, final int code, final String reason) {
99+
Log.d(TAG, "onClosing");
93100
webSocket.close(code, reason);
94101
}
95102
}
96103

97104
);
105+
Log.d(TAG, "Socket inited " + openedSocked);
98106
}
99107

100108
@Override

lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,20 @@ public void connect() {
100100
* @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
101101
*/
102102
public void connect(@Nullable List<StompHeader> _headers) {
103+
104+
Log.d(TAG, "Connect");
105+
103106
mHeaders = _headers;
104107

105-
if (mConnected) return;
108+
if (mConnected) {
109+
Log.d(TAG, "Already connected, ignore");
110+
return;
111+
}
106112
mLifecycleDisposable = mConnectionProvider.lifecycle()
107113
.subscribe(lifecycleEvent -> {
108114
switch (lifecycleEvent.getType()) {
109115
case OPENED:
116+
Log.d(TAG, "Socket connected, send connect command to stomp");
110117
List<StompHeader> headers = new ArrayList<>();
111118
headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
112119
headers.add(new StompHeader(StompHeader.HEART_BEAT, "0," + heartbeat));
@@ -116,17 +123,20 @@ public void connect(@Nullable List<StompHeader> _headers) {
116123
break;
117124

118125
case CLOSED:
126+
Log.d(TAG, "Socket closed");
119127
setConnected(false);
120128
isConnecting = false;
121129
break;
122130

123131
case ERROR:
132+
Log.d(TAG, "Socket closed with error");
124133
setConnected(false);
125134
isConnecting = false;
126135
break;
127136
}
128137
});
129138

139+
Log.d(TAG, "Subscribe to messages for create connection");
130140
isConnecting = true;
131141
mMessagesDisposable = mConnectionProvider.messages()
132142
.map(StompMessage::from)

0 commit comments

Comments
 (0)