svn commit: r889697 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: gms/GossipDigestSynMessage.java service/CassandraServer.java utils/Log4jLogger.java utils/LogUtil.java

[jb...@apache.org]

Author: jbellis
Date: Fri Dec 11 16:58:47 2009
New Revision: 889697

URL: http://svn.apache.org/viewvc?rev=889697&view=rev
Log:
start removal of LogUtil class: the easy parts.  patch by jbellis

Removed:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/Log4jLogger.java
Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/LogUtil.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java?rev=889697&r1=889696&r2=889697&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java Fri Dec 11 16:58:47 2009
@@ -26,9 +26,7 @@
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.net.CompactEndPointSerializationHelper;
 import java.net.InetAddress;
-import org.apache.cassandra.utils.Log4jLogger;
 import org.apache.log4j.Logger;
-import org.apache.cassandra.utils.*;
 
 
 /**
@@ -113,7 +111,7 @@
 
 class EndPointStatesSerializationHelper
 {
-    private static Log4jLogger logger_ = new Log4jLogger(EndPointStatesSerializationHelper.class.getName());
+    private static final Logger logger_ = Logger.getLogger(EndPointStatesSerializationHelper.class);
     
     static boolean serialize(Map<InetAddress, EndPointState> epStateMap, DataOutputStream dos) throws IOException
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java?rev=889697&r1=889696&r2=889697&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java Fri Dec 11 16:58:47 2009
@@ -65,7 +65,6 @@
 	public void start() throws IOException
     {
 		LogUtil.init();
-		//LogUtil.setLogLevel("com.facebook", "DEBUG");
 		// Start the storage service
 		storageService.initServer();
 	}

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/LogUtil.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/LogUtil.java?rev=889697&r1=889696&r2=889697&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/LogUtil.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/LogUtil.java Fri Dec 11 16:58:47 2009
@@ -25,26 +25,21 @@
 import org.apache.log4j.spi.LoggerFactory;
 import org.apache.log4j.xml.DOMConfigurator;
 
+@Deprecated
 public class LogUtil
 {
 
-    public LogUtil()
+    private LogUtil()
     {
     }
 
     public static void init()
     {
-        //BasicConfigurator.configure();
         String file = System.getProperty("storage-config");
         file += File.separator + "log4j.properties";
         PropertyConfigurator.configure(file);
     }
 
-    public static Logger getLogger(String name)
-    {
-        return Logger.getLogger(name);
-    }
-    
     public static String stackTrace(Throwable e)
     {
         StringWriter sw = new StringWriter();
@@ -79,41 +74,4 @@
         return sbuf.toString();
     }
 
-    public static String getLogMessage(String message)
-    {
-        StringBuilder sbuf = new StringBuilder((new StringBuilder())
-        		.append("Log started at : ")
-        		.append(getTimestamp())
-        		.toString());
-        sbuf.append(File.separator)
-        	.append(message);
-        return sbuf.toString();
-    }
-
-    public static void setLogLevel(String logger, String level)
-    {        
-        Logger loggerObj = LogManager.getLogger(logger);
-        if(null == loggerObj)
-            return;
-        level = level.toUpperCase();
-        if(level.equals("DEBUG"))
-            loggerObj.setLevel(Level.DEBUG);
-        else
-        if(level.equals("ERROR"))
-            loggerObj.setLevel(Level.ERROR);
-        else
-        if(level.equals("FATAL"))
-            loggerObj.setLevel(Level.FATAL);
-        else
-        if(level.equals("INFO"))
-            loggerObj.setLevel(Level.INFO);
-        else
-        if(level.equals("OFF"))
-            loggerObj.setLevel(Level.OFF);
-        else
-        if(level.equals("WARN"))
-            loggerObj.setLevel(Level.WARN);
-        else
-            loggerObj.setLevel(Level.ALL);
-    }
 }