[Amdatu-commits] SVN r646 - sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Fri Jan 14 15:31:52 2011
New Revision: 646

Log:


Modified:
   sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java

Modified: sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java
==============================================================================
--- sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java        
(original)
+++ sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java        
Fri Jan 14 15:31:52 2011
@@ -1,5 +1,7 @@
 package org.amdatu.cassandra;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -19,6 +21,7 @@
 import org.apache.cassandra.thrift.TimedOutException;
 import org.apache.cassandra.thrift.UnavailableException;
 import org.apache.cassandra.thrift.Cassandra.Iface;
+import org.apache.log4j.PropertyConfigurator;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
@@ -70,10 +73,14 @@
 
     }
 
-    public Main() throws TTransportException {
+    public Main() throws TTransportException, IOException {
         System.out.println("Starting Amdatu cassandra daemon...");
-        //System.setProperty("cassandra.config", new 
File("conf/cassandra.yaml").toURI().toString());
-        //PropertyConfigurator.configure(new 
File("conf/log4j-server.properties").getAbsolutePath());
+        String yaml = 
this.getClass().getClassLoader().getResources("cassandra.yaml").nextElement().toString();
+        System.setProperty("cassandra.config", yaml.toString());
+        System.out.println("cassandra.yaml="+yaml);
+        String log4j = 
this.getClass().getClassLoader().getResources("log4j-server.properties").nextElement().toString();
+        PropertyConfigurator.configure(new File(log4j).getAbsolutePath());
+        System.out.println("log4j.properties="+log4j);
         System.setProperty("cassandra-foreground", "true");
         new CassandraDaemonThread().start();
         System.out.println(System.currentTimeMillis() + " Creating cassandra 
client...");