Fixes the problem

Essentially when merging property lists, should only take the old data when setting the channel to be inactive. Otherwise only the new data owned by the recceiver is relevant

Author: jacomago

server/recceiver/cfstore.py

@@ -273,8 +273,6 @@ def _commitWithThread(self, transaction):
                 )
                 continue
             recordInfoByName[info["pvName"]] = info
-            _log.debug("Add record: {record_id}: {info}".format(record_id=record_id, info=info))
-            _log.debug("Add record: {record_id}: {info}".format(record_id=record_id, info=info))
 
         if transaction.initial:
             """Add IOC to source list """
@@ -538,6 +536,7 @@ def __updateCF__(
                             create_time_property(owner, iocTime),
                         ],
                         cf_channel,
+                        use_old=True,
                     )
                     channels.append(cf_channel)
                     _log.debug("Add orphaned channel with no IOC: {s}".format(s=channels[-1]))
@@ -551,6 +550,7 @@ def __updateCF__(
                                         create_time_property(owner, iocTime),
                                     ],
                                     alias,
+                                    use_old=True,
                                 )
                                 channels.append(alias)
                                 _log.debug("Add orphaned alias with no IOC: {s}".format(s=channels[-1]))
@@ -560,13 +560,20 @@ def __updateCF__(
                     Channel exists in Channelfinder with same hostname and iocname.
                     Update the status to ensure it is marked active and update the time.
                     """
+                    _log.debug(
+                        "Channel {s} exists in Channelfinder with same hostname and iocname".format(
+                            s=cf_channel["name"]
+                        )
+                    )
+                    _log.debug("Property list before: {s}".format(s=cf_channel["properties"]))
                     cf_channel["properties"] = __merge_property_lists(
                         [
                             create_active_property(owner),
                             create_time_property(owner, iocTime),
                         ],
                         cf_channel,
                     )
+                    _log.debug("Property list after: {s}".format(s=cf_channel["properties"]))
                     channels.append(cf_channel)
                     _log.debug("Add existing channel with same IOC: {s}".format(s=channels[-1]))
                     new_channels.remove(cf_channel["name"])
@@ -710,15 +717,18 @@ def create_default_properties(owner, iocTime, recceiverid, channels_dict, iocs,
     )
 
 
-def __merge_property_lists(newProperties: list[dict[str, str]], channel: dict[str, list[dict[str, str]]]):
+def __merge_property_lists(
+    newProperties: list[dict[str, str]], channel: dict[str, list[dict[str, str]]], use_old=False
+):
     """
     Merges two lists of properties ensuring that there are no 2 properties with
     the same name In case of overlap between the new and old property lists the
     new property list wins out
     """
     newPropNames = [p["name"] for p in newProperties]
+    owner = channel["owner"]
     for oldProperty in channel["properties"]:
-        if oldProperty["name"] not in newPropNames:
+        if oldProperty["name"] not in newPropNames and (oldProperty["owner"] != owner or use_old):
             newProperties = newProperties + [oldProperty]
     return newProperties