Merge pull request #131 from smukil/update_master_from_dev

Update master from dev

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-- oraclejdk8
+- openjdk8
 install: true
 script: ./buildViaTravis.sh
 cache:

README.md

@@ -1,6 +1,6 @@
 # Dynomite-manager
 
-[![Build Status](https://travis-ci.org/Netflix/dynomite-manager.svg)](https://travis-ci.org/Netflix/dynomite-manager)
+[![Build Status](https://travis-ci.com/Netflix/dynomite-manager.svg)](https://travis-ci.com/Netflix/dynomite-manager)
 [![Dev chat at https://gitter.im/Netflix/dynomite](https://badges.gitter.im/Netflix/dynomite.svg)](https://gitter.im/Netflix/dynomite?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Netflix/dynomite-manager/blob/dev/LICENSE)
 

dynomitemanager-core/src/main/java/com/netflix/dynomitemanager/monitoring/ProcessMonitorTask.java

@@ -98,8 +98,17 @@ public void execute() throws Exception {
         instanceState.setStorageAlive(storageProxy.isAlive());
         logger.info(String.format("ProcessMonitor state: %s, time elapsted to check (micros): %s",
                         instanceState, stopwatch.elapsed(MICROSECONDS)));
-
 
+        if((!instanceState.isStorageProxyProcessAlive())) {
+            if (!instanceState.isStorageAlive()) {
+                logger.error("FATAL: Redis is down.");
+                // TODO: Take appropriate action.
+            }
+            else {
+                logger.info("Detected Dynomite process is not running. Restarting dynomite.");
+            }
+            dynomiteProcess.start();
+        }
         /*
         if((!instanceState.isStorageProxyAlive() && instanceState.isStorageProxyProcessAlive())) {
             if (!instanceState.isStorageAlive()) {

dynomitemanager-core/src/main/java/com/netflix/dynomitemanager/storage/StorageProcessManager.java

@@ -109,7 +109,7 @@ private List<String> getStartCommand() {
      */
     private List<String> getStopCommand() {
 	List<String> stopCmd = new LinkedList<String>();
-	for (String param : storageProxy.getStartupScript().split(" ")) {
+	for (String param : storageProxy.getStopScript().split(" ")) {
 	    if (StringUtils.isNotBlank(param))
 		stopCmd.add(param);
 	}