git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged ex_shutdown into nepi-3-dev
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
ccn
/
ccnpingserver.py
diff --git
a/src/nepi/resources/linux/ccn/ccnpingserver.py
b/src/nepi/resources/linux/ccn/ccnpingserver.py
index
b566c78
..
6e87b27
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccnpingserver.py
+++ b/
src/nepi/resources/linux/ccn/ccnpingserver.py
@@
-18,8
+18,8
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import ResourceManager, clsinit_copy,
ResourceState,
\
- reschedule_delay
+from nepi.execution.resource import ResourceManager, clsinit_copy, \
+ ResourceState, reschedule_delay, failtrap
from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication
from nepi.util.timefuncs import tnow, tdiffsec
from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication
from nepi.util.timefuncs import tnow, tdiffsec
@@
-54,6
+54,7
@@
class LinuxCCNPingServer(LinuxCCNApplication):
super(LinuxCCNPingServer, self).__init__(ec, guid)
self._home = "ccnping-serv-%s" % self.guid
super(LinuxCCNPingServer, self).__init__(ec, guid)
self._home = "ccnping-serv-%s" % self.guid
+ @failtrap
def deploy(self):
if not self.get("command"):
self.set("command", self._start_command)
def deploy(self):
if not self.get("command"):
self.set("command", self._start_command)