From 400e7a3c28f398f03d63487bf6fc873d413a05c4 Mon Sep 17 00:00:00 2001 From: Neil Huang Date: Sun, 27 Sep 2020 16:12:04 -0700 Subject: [PATCH] MB-41694 - log default or non-default replication update msg correctly Change-Id: I8a3ad296fb7d1471cf6909d355f88beef4d44ec6 Reviewed-on: http://review.couchbase.org/c/goxdcr/+/136977 Reviewed-by: Lilei Chen Reviewed-by: Neil Huang Tested-by: Neil Huang --- replication_manager/replication_manager.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/replication_manager/replication_manager.go b/replication_manager/replication_manager.go index bb5dfbed..63144be2 100644 --- a/replication_manager/replication_manager.go +++ b/replication_manager/replication_manager.go @@ -1128,7 +1128,7 @@ func writeCreateReplicationEvent(spec *metadata.ReplicationSpecification, realUs } func writeUpdateDefaultReplicationSettingsEvent(changedSettingsMap *metadata.ReplicationSettingsMap, realUserId *service_def.RealUserId, localRemoteIPs *service_def.LocalRemoteIPs) { - event, err := constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap, realUserId, localRemoteIPs) + event, err := constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap, realUserId, localRemoteIPs, true) if err == nil { err = AuditService().Write(service_def.UpdateDefaultReplicationSettingsEventId, event) } @@ -1139,7 +1139,7 @@ func writeUpdateReplicationSettingsEvent(spec *metadata.ReplicationSpecification replicationSpecificFields, err := constructReplicationSpecificFieldsFromSpec(spec) if err == nil { var updateDefaultReplicationSettingsEvent *service_def.UpdateDefaultReplicationSettingsEvent - updateDefaultReplicationSettingsEvent, err = constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap, realUserId, localRemoteIPs) + updateDefaultReplicationSettingsEvent, err = constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap, realUserId, localRemoteIPs, false) if err == nil { updateReplicationSettingsEvent := &service_def.UpdateReplicationSettingsEvent{ ReplicationSpecificFields: *replicationSpecificFields, @@ -1192,8 +1192,12 @@ func constructGenericReplicationEvent(spec *metadata.ReplicationSpecification, r ReplicationSpecificFields: *replicationSpecificFields}, nil } -func constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap *metadata.ReplicationSettingsMap, realUserId *service_def.RealUserId, localRemoteIPs *service_def.LocalRemoteIPs) (*service_def.UpdateDefaultReplicationSettingsEvent, error) { - logger_rm.Info("Start constructUpdateDefaultReplicationSettingsEvent....") +func constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap *metadata.ReplicationSettingsMap, realUserId *service_def.RealUserId, localRemoteIPs *service_def.LocalRemoteIPs, forDefaultReplication bool) (*service_def.UpdateDefaultReplicationSettingsEvent, error) { + var eventName = "constructUpdateDefaultReplicationSettingsEvent" + if !forDefaultReplication { + eventName = "constructUpdateReplicationSettingsEvent" + } + logger_rm.Infof("Start %v....", eventName) genericReplicationFields, err := constructGenericReplicationFields(realUserId, localRemoteIPs) if err != nil { return nil, err @@ -1208,7 +1212,7 @@ func constructUpdateDefaultReplicationSettingsEvent(changedSettingsMap *metadata convertedSettingsMap[SettingsKeyToRestKeyMap[key]] = value } } - logger_rm.Info("Done constructUpdateDefaultReplicationSettingsEvent....") + logger_rm.Infof("Done %v....", eventName) return &service_def.UpdateDefaultReplicationSettingsEvent{ GenericReplicationFields: *genericReplicationFields,