Merge pull request aol#276 from aol/sigar-provisioning

johnmcclean · web-flow · commit 78d2339470bb · 2016-11-06T23:16:58.000Z
make sigar provisioning location configurable
diff --git a/micro-machine-stats/src/main/java/com/aol/micro/server/machine/stats/sigar/StatsServletContextListener.java b/micro-machine-stats/src/main/java/com/aol/micro/server/machine/stats/sigar/StatsServletContextListener.java
@@ -5,38 +5,43 @@
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import kamon.sigar.SigarProvisioner;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 
 import com.aol.cyclops.util.ExceptionSoftener;
 
+import kamon.sigar.SigarProvisioner;
 
 public class StatsServletContextListener implements ServletContextListener {
 
-	private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		
-			String workingDir = System.getProperty("user.dir");
-			String destination = workingDir + "/sigar-lib";
-			logger.info("java.library.path is {}", destination);
-			System.setProperty("java.library.path", destination);
-		
-		if(!new File(System.getProperty("java.library.path")).exists()){
-		 final File location = new File(System.getProperty("java.library.path"));
-	        try {
-				SigarProvisioner.provision(location);
-			} catch (Exception e) {
-				throw ExceptionSoftener.throwSoftenedException(e);
-			}
-	       
-		}
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-	}
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Value("${machine.stats.deploy.dir:#{null}}")
+    String deployDir;
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+
+        String workingDir = deployDir == null ? System.getProperty("user.dir") : deployDir;
+        String destination = workingDir + "/sigar-lib";
+
+        System.setProperty("java.library.path", destination);
+        logger.info("java.library.path is {}", destination);
+        if (!new File(
+                      System.getProperty("java.library.path")).exists()) {
+            final File location = new File(
+                                           System.getProperty("java.library.path"));
+            try {
+                SigarProvisioner.provision(location);
+            } catch (Exception e) {
+                throw ExceptionSoftener.throwSoftenedException(e);
+            }
+
+        }
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+    }
 }
diff --git a/micro-machine-stats/src/test/java/app/sigar/com/aol/micro/server/StatsRunnerTest.java b/micro-machine-stats/src/test/java/app/sigar/com/aol/micro/server/StatsRunnerTest.java
@@ -1,7 +1,8 @@
 package app.sigar.com.aol.micro.server;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.util.concurrent.ExecutionException;
@@ -15,34 +16,37 @@
 import com.aol.micro.server.module.ConfigurableModule;
 import com.aol.micro.server.testing.RestAgent;
 
-@Microserver
+@Microserver(properties = { "machine.stats.deploy.dir", "/tmp" })
 public class StatsRunnerTest {
 
-	RestAgent rest = new RestAgent();
+    RestAgent rest = new RestAgent();
 
-	MicroserverApp server;
+    MicroserverApp server;
 
-	@Before
-	public void startServer() {
-		server = new MicroserverApp(ConfigurableModule.builder()
-				.context("simple-app").build());
+    @Before
+    public void startServer() {
+        new File(
+                 "/tmp/sigar-lib").delete();
+        server = new MicroserverApp(
+                                    ConfigurableModule.builder()
+                                                      .context("simple-app")
+                                                      .build());
 
-		server.start();
+        server.start();
 
-	}
+    }
 
-	@After
-	public void stopServer() {
-		server.stop();
-	}
+    @After
+    public void stopServer() {
+        server.stop();
+    }
 
-	@Test
-	public void runAppAndBasicTest() throws InterruptedException,
-			ExecutionException {
+    @Test
+    public void runAppAndBasicTest() throws InterruptedException, ExecutionException {
 
-		assertThat(rest.get("http://localhost:8080/simple-app/stats/machine"),
-				containsString("cpu-stats"));
-
-	}
+        assertThat(rest.get("http://localhost:8080/simple-app/stats/machine"), containsString("cpu-stats"));
+        assertTrue(new File(
+                            "/tmp/sigar-lib").exists());
+    }
 
 }
