X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fneco%2Fresources%2Flinux%2Fapplication.py;h=953c651ed42d83dfe197733f5007248a261f407b;hb=d32dba78910bd348b9bbeb0e8242d31bfd39c0a7;hp=4f2b989fa1c54ef506521f95d523a85eef0758da;hpb=7a9e71714aa04620778742135637c9f1ed8c499b;p=nepi.git

diff --git a/src/neco/resources/linux/application.py b/src/neco/resources/linux/application.py
index 4f2b989f..953c651e 100644
--- a/src/neco/resources/linux/application.py
+++ b/src/neco/resources/linux/application.py
@@ -181,6 +181,9 @@ class LinuxApplication(ResourceManager):
         # upload code
         self.upload_code()
 
+        # upload stdin
+        self.upload_stdin()
+
         # install dependencies
         self.install_dependencies()
 
@@ -194,8 +197,14 @@ class LinuxApplication(ResourceManager):
         x11 = self.get("forwardX11")
         if not x11 and command:
             self.info("Uploading command '%s'" % command)
-        
-            # TODO: missing set PATH and PYTHONPATH!!
+
+            # Export environment
+            environ = ""
+            env = self.get("env") or ""
+            for var in env.split(" "):
+                environ += 'export %s\n' % var
+
+            command = environ + command
 
             # If the command runs asynchronous, pre upload the command 
             # to the app.sh file in the remote host
@@ -255,6 +264,15 @@ class LinuxApplication(ResourceManager):
             dst = os.path.join(self.src_dir, "code")
             self.node.upload(sources, dst, text = True)
 
+    def upload_stdin(self):
+        stdin = self.get("stdin")
+        if stdin:
+            # create dir for sources
+            self.info(" Uploading stdin ")
+
+            dst = os.path.join(self.app_home, "stdin")
+            self.node.upload(stdin, dst, text = True)
+
     def install_dependencies(self):
         depends = self.get("depends")
         if depends:
@@ -303,13 +321,13 @@ class LinuxApplication(ResourceManager):
             super(LinuxApplication, self).deploy()
 
     def start(self):
-        command = self.get("command")
-        env = self.get("env")
-        stdin = 'stdin' if self.get("stdin") else None
-        stdout = 'stdout' if self.get("stdout") else 'stdout'
-        stderr = 'stderr' if self.get("stderr") else 'stderr'
+        command = self.get('command')
+        env = self.get('env')
+        stdin = 'stdin' if self.get('stdin') else None
+        stdout = 'stdout' if self.get('stdout') else 'stdout'
+        stderr = 'stderr' if self.get('stderr') else 'stderr'
         sudo = self.get('sudo') or False
-        x11 = self.get("forwardX11") or False
+        x11 = self.get('forwardX11') or False
         failed = False
 
         super(LinuxApplication, self).start()
@@ -322,24 +340,29 @@ class LinuxApplication(ResourceManager):
         self.info("Starting command '%s'" % command)
 
         if x11:
+            if env:
+                # Export environment
+                environ = ""
+                for var in env.split(" "):
+                    environ += ' %s ' % var
+
+                command = "(" + environ + " ; " + command + ")"
+                command = self.replace_paths(command)
+
             # If the command requires X11 forwarding, we
             # can't run it asynchronously
             (out, err), proc = self.node.execute(command,
                     sudo = sudo,
                     stdin = stdin,
-                    stdout = stdout,
-                    stderr = stderr,
-                    env = env,
                     forward_x11 = x11)
 
+            self._state = ResourceState.FINISHED
+
             if proc.poll() and err:
                 failed = True
         else:
             # Command was  previously uploaded, now run the remote
             # bash file asynchronously
-            if env:
-                env = self.replace_paths(env)
-
             cmd = "bash ./app.sh"
             (out, err), proc = self.node.run(cmd, self.app_home, 
                 stdin = stdin, 
@@ -452,7 +475,8 @@ class LinuxApplication(ResourceManager):
             .replace("${BUILD}", absolute_dir(self.build_dir))
             .replace("${APP_HOME}", absolute_dir(self.app_home))
             .replace("${NODE_HOME}", absolute_dir(self.node.node_home))
-            .replace("${EXP_HOME}", self.node.exp_home) )
+            .replace("${EXP_HOME}", absolute_dir(self.node.exp_home) )
+            )
         
     def valid_connection(self, guid):
         # TODO: Validate!
@@ -462,25 +486,3 @@ class LinuxApplication(ResourceManager):
         self._node = resources[0] if len(resources) == 1 else None
         return self._node
 
-    def hash_app(self):
-        """ Generates a hash representing univokely the application.
-        Is used to determine whether the home directory should be cleaned
-        or not.
-
-        """
-        command = self.get("command")
-        forwards_x11 = self.get("forwardX11")
-        env = self.get("env")
-        sudo = self.get("sudo")
-        depends = self.get("depends")
-        sources = self.get("sources")
-        cls._register_attribute(sources)
-        cls._register_attribute(build)
-        cls._register_attribute(install)
-        cls._register_attribute(stdin)
-        cls._register_attribute(stdout)
-        cls._register_attribute(stderr)
-        cls._register_attribute(tear_down)
-        skey = "".join(map(str, args))
-        return hashlib.md5(skey).hexdigest()
-