Merge pull request #26 from scottbessler/master

allow the passing of config yaml as File
jsevellec · Aug 7, 2012 · e5e5f40 · e5e5f40
2 parents af7940a + 656e67d
commit e5e5f40
Showing 1 changed file with 48 additions and 39 deletions.
diff --git a/src/main/java/org/cassandraunit/utils/EmbeddedCassandraServerHelper.java b/src/main/java/org/cassandraunit/utils/EmbeddedCassandraServerHelper.java
@@ -49,56 +49,65 @@ public static void startEmbeddedCassandra(String yamlFile) throws TTransportExce
 		startEmbeddedCassandra(yamlFile, DEFAULT_TMP_DIR);
 	}
 
+	public static void startEmbeddedCassandra(String yamlFile, String tmpDir) throws TTransportException, IOException, ConfigurationException {
+		if (cassandraDaemon != null) {
+			/* nothing to do Cassandra is already started */
+			return;
+		}
+
+		if (!StringUtils.startsWith(yamlFile, "/")) {
+			yamlFile = "/" + yamlFile;
+		}
+
+		rmdir(tmpDir);
+		copy(yamlFile, tmpDir);
+		File file = new File(tmpDir + yamlFile);
+		startEmbeddedCassandra(file, tmpDir);
+	}
+
 	/**
 	 * Set embedded cassandra up and spawn it in a new thread.
 	 * 
 	 * @throws TTransportException
 	 * @throws IOException
 	 * @throws InterruptedException
 	 */
-	public static void startEmbeddedCassandra(String yamlFile, String tmpDir) throws TTransportException, IOException, ConfigurationException {
+	public static void startEmbeddedCassandra(File file, String tmpDir) throws TTransportException, IOException, ConfigurationException {
+		if (cassandraDaemon != null) {
+			/* nothing to do Cassandra is already started */
+			return;
+		}
 
-        if (!StringUtils.startsWith(yamlFile, "/")) {
-            yamlFile = "/" + yamlFile;
-        }
+		checkConfigNameForRestart(file.getAbsolutePath());
+
+		log.debug("Starting cassandra...");
+		log.debug("Initialization needed");
 
+		System.setProperty("cassandra.config", "file:" + file.getAbsolutePath());
+		System.setProperty("cassandra-foreground", "true");
 
-		if (cassandraDaemon == null) {
-            checkConfigNameForRestart(yamlFile);
-
-			log.debug("Starting cassandra...");
-			log.debug("Initialization needed");
-			rmdir(tmpDir);
-			copy(yamlFile, tmpDir);
-
-			System.setProperty("cassandra.config", "file:" + tmpDir + yamlFile);
-			System.setProperty("cassandra-foreground", "true");
-
-            // If there is no log4j config set already, set the default config
-            if(System.getProperty("log4j.configuration") == null) {
-                copy(DEFAULT_LOG4J_CONFIG_FILE, tmpDir);
-                System.setProperty("log4j.configuration", "file:" + tmpDir + DEFAULT_LOG4J_CONFIG_FILE);
-            }
-
-			cleanupAndLeaveDirs();
-			final CountDownLatch startupLatch = new CountDownLatch(1);
-            executor = Executors.newSingleThreadExecutor();
-			executor.execute(new Runnable() {
-				@Override
-				public void run() {
-					cassandraDaemon = new CassandraDaemon();
-					cassandraDaemon.activate();
-					startupLatch.countDown();
-				}
-			});
-			try {
-				startupLatch.await(10, SECONDS);
-			} catch (InterruptedException e) {
-				log.error("Interrupted waiting for Cassandra daemon to start:", e);
-				throw new AssertionError(e);
+		// If there is no log4j config set already, set the default config
+		if (System.getProperty("log4j.configuration") == null) {
+			copy(DEFAULT_LOG4J_CONFIG_FILE, tmpDir);
+			System.setProperty("log4j.configuration", "file:" + tmpDir + DEFAULT_LOG4J_CONFIG_FILE);
+		}
+
+		cleanupAndLeaveDirs();
+		final CountDownLatch startupLatch = new CountDownLatch(1);
+		executor = Executors.newSingleThreadExecutor();
+		executor.execute(new Runnable() {
+			@Override
+			public void run() {
+				cassandraDaemon = new CassandraDaemon();
+				cassandraDaemon.activate();
+				startupLatch.countDown();
 			}
-		} else {
-			/* nothing to do Cassandra is already started */
+		});
+		try {
+			startupLatch.await(10, SECONDS);
+		} catch (InterruptedException e) {
+			log.error("Interrupted waiting for Cassandra daemon to start:", e);
+			throw new AssertionError(e);
 		}
 	}