usov_i-org/bec
1
0
Fork 0
mirror of https://github.com/ivan-usov-org/bec.git synced 2025-04-22 02:20:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ensure that only existing storage units are removed

Browse Source
This commit is contained in:
wakonig_k 2022-09-16 21:12:27 +02:00
parent 405ef35788
commit ef01f03bcf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scan_bundler/scan_bundler/scan_bundler.py
View File

@ -311,7 +311,7 @@ class ScanBundler(BECService):
time.sleep(0.1) time.sleep(0.1)
elapsed_time += 0.1 elapsed_time += 0.1
if elapsed_time > timeout_time: if elapsed_time > timeout_time:
logger.error( logger.warning(
f"Failed to insert device data for {device} to sync_storage: Could not find a matching scanID {scanID} in sync_storage." f"Failed to insert device data for {device} to sync_storage: Could not find a matching scanID {scanID} in sync_storage."
) )
return return
@ -430,12 +430,18 @@ class ScanBundler(BECService):
remove_scanIDs.append(scanID) remove_scanIDs.append(scanID)
for scanID in remove_scanIDs: for scanID in remove_scanIDs:
self.sync_storage.pop(scanID) for storage in [
self.bluesky_metadata.pop(scanID) "sync_storage",
self.primary_devices.pop(scanID) "bluesky_metadata",
self.monitor_devices.pop(scanID) "primary_devices",
self.baseline_devices.pop(scanID) "monitor_devices",
self.scan_motors.pop(scanID) "baseline_devices",
"scan_motors",
]:
try:
getattr(self, storage).pop(scanID)
except KeyError:
logger.warning(f"Failed to remove {scanID} from {storage}.")
self.storage_initialized.remove(scanID) self.storage_initialized.remove(scanID)
def _send_scan_point(self, scanID, pointID) -> None: def _send_scan_point(self, scanID, pointID) -> None: