X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fccn%2Fccncontent.py;h=1fa93ccf9cdac5d9e954ee67a1a1fbe4b914b380;hb=386498468dfb01f71b0efbbe0c208819f18f82ec;hp=5b9d925280aa6627a43228a7e5e2fc9e53818317;hpb=e1775e60fe18089a707aa3ddd3607e53f880853c;p=nepi.git diff --git a/src/nepi/resources/linux/ccn/ccncontent.py b/src/nepi/resources/linux/ccn/ccncontent.py index 5b9d9252..1fa93ccf 100644 --- a/src/nepi/resources/linux/ccn/ccncontent.py +++ b/src/nepi/resources/linux/ccn/ccncontent.py @@ -98,11 +98,10 @@ class LinuxCCNContent(LinuxApplication): self.provision() except: self.fail() - raise - + return + self.debug("----- READY ---- ") - self._ready_time = tnow() - self._state = ResourceState.READY + self.set_ready() def upload_start_command(self): command = self.get("command") @@ -122,27 +121,20 @@ class LinuxCCNContent(LinuxApplication): env, blocking = True) if proc.poll(): - self.fail() msg = "Failed to execute command" self.error(msg, out, err) raise RuntimeError, msg def start(self): - if self._state == ResourceState.READY: + if self.state == ResourceState.READY: command = self.get("command") self.info("Starting command '%s'" % command) - self._start_time = tnow() - self._state = ResourceState.STARTED + self.set_started() else: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - self._state = ResourceState.FAILED - raise RuntimeError, msg - - @property - def state(self): - return self._state + sef.fail() @property def _start_command(self):