Merge pull request #11 from jpmorganchase/clean_shutdown

Wait for solc quit to complete before returning (fixes #5)

Author: chetan

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/db/BlockScanner.java

@@ -81,7 +81,7 @@ public void init() {
     }
 
     public void shutdown() {
-        LOG.debug("shutdown " + getId());
+        LOG.info("Stopping BlockScanner (thread id=" + getId() + ")");
         this.stopped = true;
         synchronized(wakeup) {
             this.wakeup.notify();

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/db/MetricsBlockListener.java

@@ -100,10 +100,14 @@ private void startThread() {
     @PreDestroy
     @Override
     public void shutdown() {
+        LOG.info("Stopping MetricsBlockListener (thread id=" + metricCollector.getId() + ")");
         LOG.debug("shutdown" + metricCollector.getId());
         if (this.metricCollector != null && this.metricCollector.isAlive()) {
             this.metricCollector.running = false;
-            this.metricCollector.interrupt();
+            try {
+              this.metricCollector.join();
+            } catch (InterruptedException e) {
+            }
         }
     }
 

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/db/SavingBlockListener.java

@@ -95,9 +95,8 @@ protected void init() {
     @PreDestroy
     @Override
     public void shutdown() {
-        LOG.debug("shutdown " + blockSaver.getId());
+        LOG.info("Stopping SavingBlockListener (thread id=" + blockSaver.getId() + ")");
         blockSaver.running = false;
-        blockSaver.interrupt();
     }
 
     protected void saveBlock(Block block) {

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/service/impl/GethHttpServiceImpl.java

@@ -284,15 +284,17 @@ protected void autoStop() {
         deletePid();
 
         // stop solc server
+        LOG.info("Stopping solc daemon");
         List<String> args = Lists.newArrayList(
                 gethConfig.getNodePath(),
                 gethConfig.getSolcPath(),
                 "--stop-ipc");
 
         ProcessBuilder builder = ProcessUtils.createProcessBuilder(gethConfig, args);
         try {
-            builder.start();
-        } catch (IOException e) {
+            Process proc = builder.start();
+            proc.waitFor();
+        } catch (IOException | InterruptedException e) {
         }
     }