andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check if loglevel is enabled before log

Browse Source
This commit is contained in:
Norman Maurer 2012-08-31 21:59:08 +02:00
parent 45829ff721
commit 4759a43c4d
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java
View File

@ -195,9 +195,13 @@ abstract class AbstractNioWorker implements Worker {
// time to close the old selector as everything else is registered to the new one
selector.close();
} catch (Throwable t) {
logger.warn("Failed to close a selector.", t);
if (logger.isWarnEnabled()) {
logger.warn("Failed to close a selector.", t);
}
}
if (logger.isWarnEnabled()) {
logger.warn("Recreated Selector because of possible jdk epoll(..) bug");
}
logger.warn("Recreated Selector because of possible jdk epoll(..) bug");
return newSelector;
}

8
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -503,9 +503,13 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
// time to close the old selector as everything else is registered to the new one
selector.close();
} catch (Throwable t) {
logger.warn("Failed to close a selector.", t);
if (logger.isWarnEnabled()) {
logger.warn("Failed to close a selector.", t);
}
}
if (logger.isWarnEnabled()) {
logger.warn("Recreated Selector because of possible jdk epoll(..) bug");
}
logger.warn("Recreated Selector because of possible jdk epoll(..) bug");
return newSelector;
}

5
src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java
View File

@ -60,8 +60,9 @@ final class SelectorUtil {
}
SELECT_TIMEOUT = selectTimeout;
SELECT_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toNanos(SELECT_TIMEOUT);
logger.debug("Using select timeout of " + SELECT_TIMEOUT);
if (logger.isDebugEnabled()) {
logger.debug("Using select timeout of " + SELECT_TIMEOUT);
}
EPOOL_BUG_WORKAROUND = Boolean.valueOf(System.getProperty("org.jboss.netty.epollBugWorkaround", "false"));
if (logger.isDebugEnabled()) {
logger.debug("Epoll-bug workaround enabled = " + EPOOL_BUG_WORKAROUND);