X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fall%2Fcollector.py;h=4837feb612fc90f847d86383a839fba59a29ef20;hb=23d041fe2f0d9badf6d637009e2d42a4794325c1;hp=f13a3923fe732f204772f550136c34163acf030a;hpb=2efd5eabeba8a6577ace9132d6336d44be0510e8;p=nepi.git

diff --git a/src/nepi/resources/all/collector.py b/src/nepi/resources/all/collector.py
index f13a3923..4837feb6 100644
--- a/src/nepi/resources/all/collector.py
+++ b/src/nepi/resources/all/collector.py
@@ -28,7 +28,7 @@ import tempfile
 
 @clsinit_copy
 class Collector(ResourceManager):
-    """ The collector is reponsible of collecting traces
+    """ The collector entity is reponsible of collecting traces
     of a same type associated to RMs into a local directory.
 
     .. class:: Class Args :
@@ -43,22 +43,23 @@ class Collector(ResourceManager):
     _help = "A Collector can be attached to a trace name on another " \
         "ResourceManager and will retrieve and store the trace content " \
         "in a local file at the end of the experiment"
-    _backend_type = "all"
+    _platform = "all"
 
     @classmethod
     def _register_attributes(cls):
-        trace_name = Attribute("traceName", "Name of the trace to be collected", 
+        trace_name = Attribute("traceName", 
+                "Name of the trace to be collected", 
                 flags = Flags.Design)
-        store_dir = Attribute("storeDir", "Path to local directory to store trace results", 
-                default = tempfile.gettempdir(),
-                flags = Flags.Design)
-        sub_dir = Attribute("subDir", "Sub directory to collect traces into", 
+
+        sub_dir = Attribute("subDir", 
+                "Sub directory to collect traces into", 
                 flags = Flags.Design)
-        rename = Attribute("rename", "Name to give to the collected trace file", 
+
+        rename = Attribute("rename", 
+                "Name to give to the collected trace file", 
                 flags = Flags.Design)
 
         cls._register_attribute(trace_name)
-        cls._register_attribute(store_dir)
         cls._register_attribute(sub_dir)
         cls._register_attribute(rename)
 
@@ -79,15 +80,14 @@ class Collector(ResourceManager):
             self.error(msg)
             raise RuntimeError, msg
 
-        store_dir = self.get("storeDir")
-        self._store_path = os.path.join(store_dir, self.ec.exp_id, self.ec.run_id)
+        self._store_path = self.ec.run_dir
 
         subdir = self.get("subDir")
         if subdir:
-            self._store_path = os.path.join(self._store_path, subdir)
+            self._store_path = os.path.join(self.store_path, subdir)
         
         msg = "Creating local directory at %s to store %s traces " % (
-            store_dir, trace_name)
+                self.store_path, trace_name)
         self.info(msg)
 
         try:
@@ -113,17 +113,20 @@ class Collector(ResourceManager):
 
         rms = self.get_connected()
         for rm in rms:
-            result = self.ec.trace(rm.guid, trace_name)
             fpath = os.path.join(self.store_path, "%d.%s" % (rm.guid, 
-                rename))
+                 rename))
+
             try:
+                result = self.ec.trace(rm.guid, trace_name)
                 f = open(fpath, "w")
                 f.write(result)
                 f.close()
             except:
+                import traceback
+                err = traceback.format_exc()
                 msg = "Couldn't retrieve trace %s for %d at %s " % (trace_name, 
                         rm.guid, fpath)
-                self.error(msg)
+                self.error(msg, out = "", err = err)
                 continue
 
         super(Collector, self).do_release()