From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 27 Jul 2011 14:00:01 +0000 (+0200)
Subject: Ability to recover local controllers
X-Git-Tag: nepi-3.0.0~343
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0931aa822fb1508dad3dc5d56e5056772f8c88ea;p=nepi.git

Ability to recover local controllers
---

diff --git a/src/nepi/util/proxy.py b/src/nepi/util/proxy.py
index 576aab1b..14f928e5 100644
--- a/src/nepi/util/proxy.py
+++ b/src/nepi/util/proxy.py
@@ -191,9 +191,6 @@ def create_experiment_controller(xml, access_config = None):
     launch = True if not access_config \
             else not access_config.get_attribute_value(DC.RECOVER)
     if not mode or mode == DC.MODE_SINGLE_PROCESS:
-        if not launch:
-            raise ValueError, "Unsupported instantiation mode: %s with lanch=False" % (mode,)
-        
         from nepi.core.execute import ExperimentController
         
         if not access_config or not access_config.has_attribute(DC.ROOT_DIRECTORY):
@@ -206,6 +203,10 @@ def create_experiment_controller(xml, access_config = None):
         # up at destruction time.
         controller._tempdir = root_dir
         
+        if not launch:
+            # try to recover
+            controller.recover()
+        
         return controller
     elif mode == DC.MODE_DAEMON:
         (root_dir, log_level, user, host, port, key, agent, environment_setup) = \