Skip to content

Avoid creating new socket every time on connectAsync #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Avoid creating new socket every time on connectAsync #40

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47f9f01
avoid creating new socket every time on connectAsync
angelix Aug 19, 2018
e7b3ba1
new connection only if ws is null or closed
angelix Aug 19, 2018
3c71d0a
fix log
angelix Aug 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 67 additions & 57 deletions src/main/java/io/github/sac/Socket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,73 +436,83 @@ public Map<String, String> getHeaders() {

public void connect() {

try {
ws = factory.createSocket(URL);
} catch (IOException e) {
logger.severe(e.toString());
}
ws.addExtension("permessage-deflate; client_max_window_bits");
for (Map.Entry<String, String> entry : headers.entrySet()) {
ws.addHeader(entry.getKey(), entry.getValue());
}
if(ws == null || ws.getState() == WebSocketState.CLOSED) {
try {
ws = factory.createSocket(URL);
} catch (IOException e) {
logger.severe(e.toString());
}
ws.addExtension("permessage-deflate; client_max_window_bits");
for (Map.Entry<String, String> entry : headers.entrySet()) {
ws.addHeader(entry.getKey(), entry.getValue());
}

ws.addListener(adapter);

try {
ws.connect();
} catch (OpeningHandshakeException e) {
// A violation against the WebSocket protocol was detected
// during the opening handshake.

logger.severe(e.toString());
// Status line.
StatusLine sl = e.getStatusLine();
logger.info("=== Status Line ===");
logger.info("HTTP Version = \n" + sl.getHttpVersion());
logger.info("Status Code = \n" + sl.getStatusCode());
logger.info("Reason Phrase = \n" + sl.getReasonPhrase());

// HTTP headers.
Map<String, List<String>> headers = e.getHeaders();
logger.info("=== HTTP Headers ===");
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
// Header name.
String name = entry.getKey();

// Values of the header.
List<String> values = entry.getValue();

if (values == null || values.size() == 0) {
// Print the name only.
logger.info(name);
continue;
}
ws.addListener(adapter);

try {
ws.connect();
} catch (OpeningHandshakeException e) {
// A violation against the WebSocket protocol was detected
// during the opening handshake.

logger.severe(e.toString());
// Status line.
StatusLine sl = e.getStatusLine();
logger.info("=== Status Line ===");
logger.info("HTTP Version = \n" + sl.getHttpVersion());
logger.info("Status Code = \n" + sl.getStatusCode());
logger.info("Reason Phrase = \n" + sl.getReasonPhrase());

// HTTP headers.
Map<String, List<String>> headers = e.getHeaders();
logger.info("=== HTTP Headers ===");
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
// Header name.
String name = entry.getKey();

// Values of the header.
List<String> values = entry.getValue();

if (values == null || values.size() == 0) {
// Print the name only.
logger.info(name);
continue;
}

for (String value : values) {
// Print the name and the value.
logger.info(name + value + "\n");
for (String value : values) {
// Print the name and the value.
logger.info(name + value + "\n");
}
}
} catch (WebSocketException e) {
e.printStackTrace();
listener.onConnectError(Socket.this, e);
reconnect();
}
} catch (WebSocketException e) {
listener.onConnectError(Socket.this, e);
reconnect();
}else{
logger.warning("Unable to connect: there is an active connection");
}

}

public void connectAsync() {
try {
ws = factory.createSocket(URL);
} catch (IOException e) {
logger.severe(e.toString());
}
ws.addExtension("permessage-deflate; client_max_window_bits");
for (Map.Entry<String, String> entry : headers.entrySet()) {
ws.addHeader(entry.getKey(), entry.getValue());
}
if(ws == null || ws.getState() == WebSocketState.CLOSED){
try {
ws = factory.createSocket(URL);
} catch (IOException e) {
logger.severe(e.toString());
}

ws.addListener(adapter);
ws.connectAsynchronously();
ws.addExtension("permessage-deflate; client_max_window_bits");
for (Map.Entry<String, String> entry : headers.entrySet()) {
ws.addHeader(entry.getKey(), entry.getValue());
}

ws.addListener(adapter);
ws.connectAsynchronously();
}else{
logger.warning("Unable to connect: there is an active connection");
}
}

private void reconnect() {
Expand Down