reapply AttributeFilters, use them on get_next_archiver

Author: sergirubio

PyTangoArchiving/hdbpp/config.py

@@ -268,16 +268,24 @@ def get_next_archiver(self,errors=False,use_freq=False, attrexp=''):
         errors/use_freq are used to compute the archiver load
         attrexp can be used to get archivers already archiving attributes
         """
+        props = dict((a,fn.tango.get_device_property(a,'AttributeFilters'))
+                     for a in self.get_archivers())
+        if any(props.values()):
+            archs = [a for a,v in props.items() if not v]
+        else:
+            archs = [a for a in props if fn.clmatch('*[0-9]$',a)]
 
         loads = dict((a,self.get_archiver_load(a,use_freq=use_freq))
-            for a in self.get_archivers() if fn.clmatch('*[0-9]$',a))
+            for a in archs)
         if errors:
             # Errors count twice as load
             for a,v in loads.items():
                 errs = self.get_archiver_errors(a)
                 loads[a] += 10*len(errs)
-                
-        if attrexp:
+
+        if not len(loads):
+            self.warning('No free archivers found!')
+        elif attrexp:
             attrs = [a for a in self.get_attributes(True) 
                      if fn.clmatch(attrexp,a)]
             archs = [self.get_attribute_archiver(a) for a in attrs]

PyTangoArchiving/hdbpp/multi.py

@@ -221,6 +221,19 @@ def check_attribute_in_all_dbs(attr_regexp,reader = None,
     #for a in attrs:
         #for m,f in filters.items():
             #pass
+
+def get_archivers_filters(archivers=''):
+    """
+    Returns the value of AttributeFilters property for each archiver in the list
+
+    :param archivers: sequence or regular expression  for matching archivers
+    :return: dictionary {archiver:regexp}
+    """
+    archs = archs if fn.isSequence(archivers) else fn.find_devices(archivers)
+    filters = fn.SortedDict(sorted((k,v['AttributeFilters']) for k,v in
+                    fn.tango.get_matching_device_properties(
+                    archiver,'AttributeFilters').items()))
+    return filters
 
 
 def get_archivers_for_attributes(attrs=[],archs='archiving/es/*'):