Mercurial > hg > release > thermostat-0.5

changeset 815:5917cd87fdb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use LoggingUtils.getLogger() over Logger.getLogger() where possible. This patch changes getLogger() calls to use LoggingUtils where possible since this ensures that logging settings - thermostat global and/or thermostat user specific - are respected. Reviewed-by: vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004351.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Fri, 30 Nov 2012 13:58:41 +0100
parents 84e6878eb77e
children ba1eb6634612
files agent/command/src/main/java/com/redhat/thermostat/agent/command/internal/ServerHandler.java agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiver.java agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/JMapHeapDumper.java client/command/src/main/java/com/redhat/thermostat/client/command/internal/RequestEncoder.java client/command/src/main/java/com/redhat/thermostat/client/command/internal/ResponseHandler.java client/core/src/main/java/com/redhat/thermostat/client/ui/IconDescriptor.java common/core/src/main/java/com/redhat/thermostat/common/dao/HeapDAOImpl.java common/core/src/main/java/com/redhat/thermostat/common/heap/HeapDump.java common/core/src/main/java/com/redhat/thermostat/common/utils/ServiceRegistry.java keyring/src/main/java/com/redhat/thermostat/utils/keyring/KeyringProvider.java killvm/agent/src/main/java/com/redhat/thermostat/killvm/agent/internal/KillVmReceiver.java killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/SwingVMKilledListener.java launcher/src/main/java/com/redhat/thermostat/launcher/internal/CommandInfoSourceImpl.java thread/client-controllers/src/main/java/com/redhat/thermostat/thread/client/controller/impl/ThreadInformationController.java thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/Harvester.java tools/src/main/java/com/redhat/thermostat/tools/cli/VMStatCommand.java unix-process-handler/src/main/java/com/redhat/thermostat/service/process/UnixProcessUtilities.java vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/internal/GC.java
diffstat 18 files changed, 39 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/agent/command/src/main/java/com/redhat/thermostat/agent/command/internal/ServerHandler.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/agent/command/src/main/java/com/redhat/thermostat/agent/command/internal/ServerHandler.java	Fri Nov 30 13:58:41 2012 +0100
@@ -53,6 +53,7 @@
 import com.redhat.thermostat.common.command.Response;
 import com.redhat.thermostat.common.command.Request.RequestType;
 import com.redhat.thermostat.common.command.Response.ResponseType;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 
 class ServerHandler extends SimpleChannelHandler {
 
@@ -62,7 +63,7 @@
         this.receivers = receivers;
     }
 
-    private static final Logger logger = Logger.getLogger(ServerHandler.class.getName());
+    private static final Logger logger = LoggingUtils.getLogger(ServerHandler.class);
 
     @Override
     public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) {
--- a/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiver.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/HeapDumpReceiver.java	Fri Nov 30 13:58:41 2012 +0100
@@ -49,11 +49,12 @@
 import com.redhat.thermostat.common.dao.HeapDAO;
 import com.redhat.thermostat.common.heap.HistogramLoader;
 import com.redhat.thermostat.common.heap.ObjectHistogram;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.storage.model.HeapInfo;
 
 public class HeapDumpReceiver implements RequestReceiver {
 
-    private static final Logger log = Logger.getLogger(HeapDumpReceiver.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(HeapDumpReceiver.class);
 
     private final HeapDAO heapDao;
 
--- a/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/JMapHeapDumper.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/agent/heapdumper/src/main/java/com/redhat/thermostat/agent/heapdumper/internal/JMapHeapDumper.java	Fri Nov 30 13:58:41 2012 +0100
@@ -40,9 +40,11 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
+import com.redhat.thermostat.common.utils.LoggingUtils;
+
 class JMapHeapDumper {
 
-    private static final Logger log = Logger.getLogger(JMapHeapDumper.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(JMapHeapDumper.class);
 
     void dumpHeap(String vmId, String filename) throws HeapDumpException {
         try {
--- a/client/command/src/main/java/com/redhat/thermostat/client/command/internal/RequestEncoder.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/client/command/src/main/java/com/redhat/thermostat/client/command/internal/RequestEncoder.java	Fri Nov 30 13:58:41 2012 +0100
@@ -52,10 +52,11 @@
 import com.redhat.thermostat.common.command.EncodingHelper;
 import com.redhat.thermostat.common.command.MessageEncoder;
 import com.redhat.thermostat.common.command.Request;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 
 class RequestEncoder extends MessageEncoder {
 
-    private static final Logger logger = Logger.getLogger(RequestEncoder.class.getName());
+    private static final Logger logger = LoggingUtils.getLogger(RequestEncoder.class);
     
     @Override
     public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) {
--- a/client/command/src/main/java/com/redhat/thermostat/client/command/internal/ResponseHandler.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/client/command/src/main/java/com/redhat/thermostat/client/command/internal/ResponseHandler.java	Fri Nov 30 13:58:41 2012 +0100
@@ -47,11 +47,12 @@
 import com.redhat.thermostat.common.command.RequestResponseListener;
 import com.redhat.thermostat.common.command.Response;
 import com.redhat.thermostat.common.command.Response.ResponseType;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 
 public class ResponseHandler extends SimpleChannelUpstreamHandler {
 
-    private static final Logger logger = Logger.getLogger(
-            ResponseHandler.class.getName());
+    private static final Logger logger = LoggingUtils
+            .getLogger(ResponseHandler.class);
 
     private final Request request;
 
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/IconDescriptor.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/IconDescriptor.java	Fri Nov 30 13:58:41 2012 +0100
@@ -43,6 +43,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.redhat.thermostat.common.utils.LoggingUtils;
+
 /**
  * Class that encapsulates an images raw data.
  * 
@@ -58,7 +60,7 @@
  */
 public class IconDescriptor {
 
-    private static final Logger logger = Logger.getLogger(IconDescriptor.class.getSimpleName());
+    private static final Logger logger = LoggingUtils.getLogger(IconDescriptor.class);
 
     private ByteBuffer data;
     private int hash;
--- a/common/core/src/main/java/com/redhat/thermostat/common/dao/HeapDAOImpl.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/common/core/src/main/java/com/redhat/thermostat/common/dao/HeapDAOImpl.java	Fri Nov 30 13:58:41 2012 +0100
@@ -51,6 +51,7 @@
 
 import com.redhat.thermostat.common.heap.HeapDump;
 import com.redhat.thermostat.common.heap.ObjectHistogram;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.storage.core.Cursor;
 import com.redhat.thermostat.storage.core.Key;
 import com.redhat.thermostat.storage.core.Query;
@@ -60,7 +61,7 @@
 
 class HeapDAOImpl implements HeapDAO {
 
-    private static final Logger log = Logger.getLogger(HeapDAOImpl.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(HeapDAOImpl.class);
 
     private final Storage storage;
 
--- a/common/core/src/main/java/com/redhat/thermostat/common/heap/HeapDump.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/common/core/src/main/java/com/redhat/thermostat/common/heap/HeapDump.java	Fri Nov 30 13:58:41 2012 +0100
@@ -67,6 +67,7 @@
 import org.apache.lucene.util.Version;
 
 import com.redhat.thermostat.common.dao.HeapDAO;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.storage.model.HeapInfo;
 import com.sun.tools.hat.internal.model.JavaHeapObject;
 import com.sun.tools.hat.internal.model.Snapshot;
@@ -81,7 +82,7 @@
 
     private static final String INDEX_FIELD_CLASSNAME = "classname";
 
-    private static final Logger log = Logger.getLogger(HeapDump.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(HeapDump.class);
 
     private final HeapInfo heapInfo;
 
--- a/common/core/src/main/java/com/redhat/thermostat/common/utils/ServiceRegistry.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/common/core/src/main/java/com/redhat/thermostat/common/utils/ServiceRegistry.java	Fri Nov 30 13:58:41 2012 +0100
@@ -65,7 +65,7 @@
     @SuppressWarnings("rawtypes")
     private final List<ServiceRegistration> ourRegistrations;
 
-    private static final Logger log = Logger.getLogger(ServiceRegistry.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(ServiceRegistry.class);
 
     public ServiceRegistry(BundleContext ctx, String registrationClassName) {
         context = ctx;
--- a/keyring/src/main/java/com/redhat/thermostat/utils/keyring/KeyringProvider.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/keyring/src/main/java/com/redhat/thermostat/utils/keyring/KeyringProvider.java	Fri Nov 30 13:58:41 2012 +0100
@@ -45,7 +45,8 @@
 
 public class KeyringProvider {
 
-    private static final Logger logger = Logger.getLogger(KeyringProvider.class.getSimpleName());
+    // Does not depend on common-core. Use java.util.logging.Logger
+    private static final Logger logger = Logger.getLogger(KeyringProvider.class.getName());
     
     public static final String DEFAULT_KEYRING = "com.redhat.thermostat.utils.keyring.GnomeKeyringLibraryNative";
     public static final String MEMORY_KEYRING = "com.redhat.thermostat.utils.keyring.MemoryKeyring";
--- a/killvm/agent/src/main/java/com/redhat/thermostat/killvm/agent/internal/KillVmReceiver.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/killvm/agent/src/main/java/com/redhat/thermostat/killvm/agent/internal/KillVmReceiver.java	Fri Nov 30 13:58:41 2012 +0100
@@ -42,13 +42,14 @@
 import com.redhat.thermostat.common.command.Request;
 import com.redhat.thermostat.common.command.Response;
 import com.redhat.thermostat.common.command.Response.ResponseType;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.service.process.UNIXProcessHandler;
 import com.redhat.thermostat.service.process.UNIXSignal;
 
 public class KillVmReceiver implements RequestReceiver {
 
     private final UNIXProcessHandler unixService;
-    private static final Logger log = Logger.getLogger(KillVmReceiver.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(KillVmReceiver.class);
     
     public KillVmReceiver(UNIXProcessHandler unixService) {
         this.unixService = unixService;
--- a/killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/SwingVMKilledListener.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/SwingVMKilledListener.java	Fri Nov 30 13:58:41 2012 +0100
@@ -46,13 +46,14 @@
 import com.redhat.thermostat.common.command.RequestResponseListener;
 import com.redhat.thermostat.common.command.Response;
 import com.redhat.thermostat.common.locale.Translate;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.killvm.client.locale.LocaleResources;
 
 public class SwingVMKilledListener implements RequestResponseListener {
 
     private final Translate<LocaleResources> t;
-    private static final Logger logger = Logger
-            .getLogger(SwingVMKilledListener.class.getName());
+    private static final Logger logger = LoggingUtils
+            .getLogger(SwingVMKilledListener.class);
 
     public SwingVMKilledListener() {
         this.t = LocaleResources.createLocalizer();
--- a/launcher/src/main/java/com/redhat/thermostat/launcher/internal/CommandInfoSourceImpl.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/launcher/src/main/java/com/redhat/thermostat/launcher/internal/CommandInfoSourceImpl.java	Fri Nov 30 13:58:41 2012 +0100
@@ -49,10 +49,11 @@
 import com.redhat.thermostat.common.cli.CommandInfo;
 import com.redhat.thermostat.common.cli.CommandInfoNotFoundException;
 import com.redhat.thermostat.common.cli.CommandInfoSource;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 
 public class CommandInfoSourceImpl implements CommandInfoSource {
 
-    private static final Logger logger = Logger.getLogger(CommandInfoSourceImpl.class.getSimpleName());
+    private static final Logger logger = LoggingUtils.getLogger(CommandInfoSourceImpl.class);
     private Map<String, CommandInfo> commands;
 
     CommandInfoSourceImpl(String thermostatHome) {
--- a/thread/client-controllers/src/main/java/com/redhat/thermostat/thread/client/controller/impl/ThreadInformationController.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/thread/client-controllers/src/main/java/com/redhat/thermostat/thread/client/controller/impl/ThreadInformationController.java	Fri Nov 30 13:58:41 2012 +0100
@@ -52,6 +52,7 @@
 import com.redhat.thermostat.common.Timer.SchedulingType;
 import com.redhat.thermostat.common.TimerFactory;
 import com.redhat.thermostat.common.dao.VmRef;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.thread.client.common.ThreadTableBean;
 import com.redhat.thermostat.thread.client.common.ThreadTableView;
 import com.redhat.thermostat.thread.client.common.ThreadTableView.ThreadSelectionAction;
@@ -65,7 +66,7 @@
 
 public class ThreadInformationController implements VmInformationServiceController {
 
-    private static final Logger logger = Logger.getLogger(ThreadInformationController.class.getSimpleName());
+    private static final Logger logger = LoggingUtils.getLogger(ThreadInformationController.class);
     
     private ThreadView view;
     private ThreadCollector collector;
--- a/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/Harvester.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/Harvester.java	Fri Nov 30 13:58:41 2012 +0100
@@ -50,6 +50,7 @@
 
 import javax.management.MalformedObjectNameException;
 
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.thread.dao.ThreadDao;
 
 import com.redhat.thermostat.thread.model.ThreadInfoData;
@@ -61,7 +62,7 @@
 @SuppressWarnings("restriction")
 class Harvester {
     
-    private static final Logger logger = Logger.getLogger(Harvester.class.getSimpleName());
+    private static final Logger logger = LoggingUtils.getLogger(Harvester.class);
     
     private boolean isConnected;
     private ScheduledExecutorService threadPool;
--- a/tools/src/main/java/com/redhat/thermostat/tools/cli/VMStatCommand.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/tools/src/main/java/com/redhat/thermostat/tools/cli/VMStatCommand.java	Fri Nov 30 13:58:41 2012 +0100
@@ -52,6 +52,7 @@
 import com.redhat.thermostat.common.dao.VmMemoryStatDAO;
 import com.redhat.thermostat.common.dao.VmRef;
 import com.redhat.thermostat.common.locale.Translate;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.common.utils.OSGIUtils;
 import com.redhat.thermostat.tools.LocaleResources;
 
@@ -59,7 +60,7 @@
 
     private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer();
 
-    private static final Logger log = Logger.getLogger(VMStatCommand.class.getName());
+    private static final Logger log = LoggingUtils.getLogger(VMStatCommand.class);
 
     private static final String CMD_NAME = "vm-stat";
 
--- a/unix-process-handler/src/main/java/com/redhat/thermostat/service/process/UnixProcessUtilities.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/unix-process-handler/src/main/java/com/redhat/thermostat/service/process/UnixProcessUtilities.java	Fri Nov 30 13:58:41 2012 +0100
@@ -47,10 +47,11 @@
 
 import com.redhat.thermostat.common.tools.ApplicationException;
 import com.redhat.thermostat.common.tools.ProcessStartException;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 
 public class UnixProcessUtilities implements UNIXProcessHandler {
 
-    private static final Logger logger = Logger.getLogger(UnixProcessUtilities.class.getSimpleName());
+    private static final Logger logger = LoggingUtils.getLogger(UnixProcessUtilities.class);
     
     private static final UNIXProcessHandler instance = new UnixProcessUtilities();
     public static UNIXProcessHandler getInstance() {
--- a/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/internal/GC.java	Mon Dec 03 15:31:44 2012 -0500
+++ b/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/internal/GC.java	Fri Nov 30 13:58:41 2012 +0100
@@ -41,12 +41,13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.redhat.thermostat.common.utils.LoggingUtils;
 import com.redhat.thermostat.utils.management.MXBeanConnection;
 import com.redhat.thermostat.utils.management.MXBeanConnector;
 
 public class GC {
 
-    private static final Logger logger = Logger.getLogger(GC.class.getSimpleName());
+    private static final Logger logger = LoggingUtils.getLogger(GC.class);
 
     private MXBeanConnector connector;
     public GC(MXBeanConnector connector) {