Skip to content

Commit

Permalink
Made loggers non-static to support deployment in containers (#970)
Browse files Browse the repository at this point in the history
Made loggers non-static to support deployment in containers
  • Loading branch information
marci4 committed Jan 20, 2020
2 parents 7bfa83d + 6636d32 commit ec0fa03
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/java_websocket/AbstractWebSocket.java
Expand Up @@ -48,7 +48,7 @@ public abstract class AbstractWebSocket extends WebSocketAdapter {
*
* @since 1.4.0
*/
private static final Logger log = LoggerFactory.getLogger(AbstractWebSocket.class);
private final Logger log = LoggerFactory.getLogger(AbstractWebSocket.class);

/**
* Attribute which allows you to deactivate the Nagle's algorithm
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/java_websocket/SSLSocketChannel.java
Expand Up @@ -70,10 +70,10 @@ public class SSLSocketChannel implements WrappedByteChannel, ByteChannel, ISSLCh
*
* @since 1.4.0
*/
private static final Logger log = LoggerFactory.getLogger(SSLSocketChannel.class);
private final Logger log = LoggerFactory.getLogger(SSLSocketChannel.class);

/**
* The underlaying socket channel
* The underlying socket channel
*/
private final SocketChannel socketChannel;

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/java_websocket/SSLSocketChannel2.java
Expand Up @@ -55,17 +55,17 @@
*/
public class SSLSocketChannel2 implements ByteChannel, WrappedByteChannel, ISSLChannel {

/**
* This object is used to feed the {@link SSLEngine}'s wrap and unwrap methods during the handshake phase.
**/
protected static ByteBuffer emptybuffer = ByteBuffer.allocate( 0 );

/**
* Logger instance
*
* @since 1.4.0
*/
private static final Logger log = LoggerFactory.getLogger(SSLSocketChannel2.class);

/**
* This object is used to feed the {@link SSLEngine}'s wrap and unwrap methods during the handshake phase.
**/
protected static ByteBuffer emptybuffer = ByteBuffer.allocate( 0 );
private final Logger log = LoggerFactory.getLogger(SSLSocketChannel2.class);

protected ExecutorService exec;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/java_websocket/WebSocketImpl.java
Expand Up @@ -85,7 +85,7 @@ public class WebSocketImpl implements WebSocket {
*
* @since 1.4.0
*/
private static final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);
private final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);

/**
* Queue of buffers that need to be sent to the client.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/java_websocket/drafts/Draft_6455.java
Expand Up @@ -86,7 +86,7 @@ public class Draft_6455 extends Draft {
*
* @since 1.4.0
*/
private static final Logger log = LoggerFactory.getLogger(Draft_6455.class);
private final Logger log = LoggerFactory.getLogger(Draft_6455.class);

/**
* Attribute for the used extension in this draft
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/org/java_websocket/server/WebSocketServer.java
Expand Up @@ -46,13 +46,11 @@

import org.java_websocket.*;
import org.java_websocket.drafts.Draft;
import org.java_websocket.exceptions.InvalidDataException;
import org.java_websocket.exceptions.WebsocketNotConnectedException;
import org.java_websocket.framing.CloseFrame;
import org.java_websocket.framing.Framedata;
import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.handshake.Handshakedata;
import org.java_websocket.handshake.ServerHandshakeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -64,14 +62,14 @@
*/
public abstract class WebSocketServer extends AbstractWebSocket implements Runnable {

private static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();

/**
* Logger instance
*
* @since 1.4.0
*/
private static final Logger log = LoggerFactory.getLogger(WebSocketServer.class);

private static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();
private final Logger log = LoggerFactory.getLogger(WebSocketServer.class);

/**
* Holds the list of active WebSocket connections. "Active" means WebSocket
Expand Down

0 comments on commit ec0fa03

Please sign in to comment.