work in progress

docker/runner/config/application.tmpl

@@ -82,3 +82,6 @@ services:
     listMethodsUrl: {{ default .Env.WOKEN_URL "http://172.22.0.1:8087" }}/list-methods
   exareme:
     miningExaremeUrl: {{ default .Env.EXAREME_URL "http://hbps2.chuv.ch:9090" }}/mining/query
+
+akka:
+  woken-path: {{ default .Env.WOKEN_PATH "akka.tcp://woken@127.0.0.1:8088/user/entrypoint" }}

src/main/java/eu/hbp/mip/controllers/ExperimentApi.java

@@ -37,7 +37,6 @@ import java.util.List;
 import java.util.UUID;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 /**
  * Created by habfast on 21/04/16.
  */
@@ -81,6 +80,9 @@ public class ExperimentApi {
     @Autowired
     private ActorSystem actorSystem;
 
+    @Value("#{'${akka.woken-path:akka.tcp://woken@127.0.0.1:8088/user/entrypoint}'}")
+    private String wokenPath;
+
 
     @ApiOperation(value = "Send a request to the workflow to run an experiment", response = Experiment.class)
     @RequestMapping(method = RequestMethod.POST)
@@ -293,7 +295,7 @@ public class ExperimentApi {
         final String url = experimentUrl;
         final String query = experiment.computeQuery();
 
-        ActorRef wokenActor = actorSystem.actorFor("woken");
+        ActorRef wokenActor = actorSystem.actorFor(wokenPath);
 
         // Should maybe use this instead ???
         // ActorRef wokenActor = actorSystem.actorOf(
@@ -301,21 +303,6 @@ public class ExperimentApi {
 
         wokenActor.tell(query, null);
 
-
-        new Thread() {
-            @Override
-            public void run() {
-                // Results are stored in the experiment object
-                try {
-                    executeExperiment(url, query, experiment);
-                } catch (IOException e) {
-                    LOGGER.trace(e);
-                    LOGGER.warn("Experiment failed to run properly !");
-                    setExperimentError(e, experiment);
-                }
-                finishExpermient(experiment);
-            }
-        }.start();
     }
 
     private void sendExaremeExperiment(Experiment experiment) {

src/main/resources/akka/application.conf

 akka {
+  loglevel = INFO
+
   actor {
-    provider = remote
+    provider = "akka.remote.RemoteActorRefProvider"
   }
   remote {
-    # enabled-transports = ["akka.remote.netty.tcp"]
+    enabled-transports = ["akka.remote.netty.tcp"]
     netty.tcp {
-      hostname = "127.0.0.1"       # external (logical) hostname
-      port = 8000                  # external (logical) port
-      bind-hostname = "127.0.0.1"  # internal (bind) hostname
-      bind-port = 2552             # internal (bind) port
+      hostname = 127.0.0.1           # external (logical) hostname
+      port = 8097                    # external (logical) port
+
+      #bind-hostname = 127.0.0.1     # internal (bind) hostname
+      #bind-port = 8084              # internal (bind) port
     }
   }
 }
\ No newline at end of file