add methods to stop archiving and clear caches

Author: sergirubio

PyTangoArchiving/hdbpp/config.py

@@ -753,17 +753,24 @@ def start_archiving(self,attribute,archiver,period=0,
                         %(attribute,traceback.format_exc().replace('\n','')))
         return False        
 
-    def stop_archiving(self, attribute):
+    def stop_archiving(self, attribute, clear=True):
         """
         This method will remove the attribute from an existing archiver
         """
-        attribute = self.is_attribute_archived(attribute)
-        if attribute: 
-            self.warning('Stopping %s' % attribute)
-            self.get_manager().AttributeStop(attribute)
-        else:
-            self.wanring('%s is not archived!' % attribute)
-        return attribute
+        try:
+            attribute = self.is_attribute_archived(attribute)
+            if attribute:
+                arch = self.get_attribute_archiver(attribute)
+                self.warning('Removing %s from %s' % (attribute,arch))
+                self.get_manager().AttributeRemove(attribute)
+                if clear:
+                    self.clear_caches()
+            else:
+                self.warning('%s is not archived!' % attribute)
+            return attribute
+        except:
+            self.warning('stop_archiving(%s) failed!' %
+                         (attribute, traceback.format_exc()))
 
     def restart_attribute(self,attr, d=''):
         try:
@@ -803,7 +810,12 @@ def restart_attributes(self,attributes=None,timewait=0.5):
 
         print('%d attributes restarted' % len(attributes))
 
-    
+    def clear_caches(self):
+        self.get_attribute_archiver.cache.clear()
+        self.get_archiver_attributes.cache.clear()
+        self.get_attribute_subscriber.cache.clear()
+        self.get_archivers_attributes.cache.clear()
+        self.dedicated = {}
 
 
 

PyTangoArchiving/hdbpp/periodic.py

@@ -180,3 +180,25 @@ def add_periodic_attributes(self,attributes,periods,wait=3.):
 
         return done
 
+    def stop_periodic_archiving(self, attribute):
+        try:
+            attribute = parse_tango_model(attribute, fqdn=True).fullname.lower()
+            arch = self.get_periodic_attribute_archiver(attribute)
+            if not arch:
+                self.warning('%s is not archived!' % attribute)
+            else:
+                self.info('Removing %s from %s' % (attribute, arch))
+                dp = fn.get_device(archiver)
+                v = dp.AttributeRemove([attribute, str(int(float(period)))])
+                dp.UpdateAttributeList()
+                fn.wait(wait)
+                return v
+        except:
+            self.warning('stop_periodic_archiving(%s) failed!' %
+                         (attribute, traceback.format_exc()))
+
+    def clear_periodic_caches(self):
+        self.get_periodic_archiver_attributes.cache.clear()
+        self.get_periodic_archivers_attributes.cache.clear()
+        self.get_periodic_attribute_archiver.cache.clear()
+        self.get_periodic_attribute_period.cache.clear()