Skip to content

Remove dependency on slf4j-api in favor of JUL #157

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

Merged
merged 2 commits into from
Nov 9, 2017
Merged

Remove dependency on slf4j-api in favor of JUL #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
072b251
Remove dependency on slf4j-api in favor of JUL
Nov 8, 2017
f4f18d5
Remove oraclejdk7 that has been deprecated on travis
zmarkan Nov 9, 2017
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ language: java
sudo: false
jdk:
- oraclejdk8
- oraclejdk7
script:
- ./gradlew test
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ repositories {

dependencies {
compile "com.google.code.gson:gson:2.2.2"
compile "org.slf4j:slf4j-api:1.7.5"
compile "com.pusher:java-websocket:1.4.1"
testCompile "org.mockito:mockito-all:1.8.5"
testCompile "org.powermock:powermock-module-junit4:1.4.11"
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;

import javax.net.ssl.SSLException;

import com.pusher.java_websocket.handshake.ServerHandshake;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.gson.Gson;

Expand All @@ -26,7 +25,7 @@
import com.pusher.client.util.Factory;

public class WebSocketConnection implements InternalConnection, WebSocketListener {
private static final Logger log = LoggerFactory.getLogger(WebSocketConnection.class);
private static final Logger log = Logger.getLogger(WebSocketConnection.class.getName());
private static final Gson GSON = new Gson();

private static final String INTERNAL_EVENT_PREFIX = "pusher:";
Expand Down Expand Up @@ -147,7 +146,7 @@ public String getSocketId() {
/* implementation detail */

private void updateState(final ConnectionState newState) {
log.debug("State transition requested, current [" + state + "], new [" + newState + "]");
log.fine("State transition requested, current [" + state + "], new [" + newState + "]");

final ConnectionStateChange change = new ConnectionStateChange(state, newState);
state = newState;
Expand Down Expand Up @@ -263,7 +262,7 @@ public void run() {
@Override
public void onClose(final int code, final String reason, final boolean remote) {
if (state == ConnectionState.DISCONNECTED || state == ConnectionState.RECONNECTING) {
log.error("Received close from underlying socket when already disconnected." + "Close code ["
log.warning("Received close from underlying socket when already disconnected." + "Close code ["
+ code + "], Reason [" + reason + "], Remote [" + remote + "]");
return;
}
Expand Down Expand Up @@ -354,7 +353,7 @@ synchronized void activity() {
pingTimer = factory.getTimers().schedule(new Runnable() {
@Override
public void run() {
log.debug("Sending ping");
log.fine("Sending ping");
sendMessage(PING_EVENT_SERIALIZED);
schedulePongCheck();
}
Expand Down Expand Up @@ -385,7 +384,7 @@ private synchronized void schedulePongCheck() {
pongTimer = factory.getTimers().schedule(new Runnable() {
@Override
public void run() {
log.debug("Timed out awaiting pong from server - disconnecting");
log.fine("Timed out awaiting pong from server - disconnecting");

underlyingConnection.removeWebSocketListener();

Expand Down