Skip to content

fix: Update evenLogger signature to have completion handler (RMCCX-9260) #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramesh-kuntamala merged 1 commit into from
Jun 30, 2025
Merged

fix: Update evenLogger signature to have completion handler (RMCCX-9260) #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Sources/REventLogger/EventLoggerModule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ final class REventLoggerModule {
_ sourceVersion: String,
_ errorCode: String,
_ errorMessage: String,
_ info: [String: String]?) {
_ info: [String: String]?,
_ completion: (() -> Void?)? = nil) {

if !isEventValid(sourceName, sourceVersion, errorCode, errorMessage) {
Logger.debug("Event Logger event contains an empty parameter")
Expand All @@ -57,22 +58,22 @@ final class REventLoggerModule {
event.updateOccurrenceCount()
}
self?.eventsStorage.insertOrUpdateEvent(eventId, event: event)
self?.sendEventIfNeeded(eventType, eventId, event, isNewEvent)
self?.sendEventIfNeeded(eventType, eventId, event, isNewEvent, completion)
}
}

func sendEventIfNeeded(_ eventType: EventType, _ eventId: String, _ event: REvent, _ isNewEvent: Bool, maxEventCount: Int = REventConstants.maxEventCount) {
func sendEventIfNeeded(_ eventType: EventType, _ eventId: String, _ event: REvent, _ isNewEvent: Bool, maxEventCount: Int = REventConstants.maxEventCount, _ completion: (() -> Void?)? = nil) {
// If full, send all of the events
if eventsStorage.getEventCount() >= maxEventCount {
sendAllEventsInStorage(deleteOldEventsOnFailure: isNewEvent)
return
}
if isNewEvent && eventType == .critical {
sendCriticalEvent(eventId, event)
sendCriticalEvent(eventId, event, completion: completion)
}
}

func sendCriticalEvent(_ eventId: String, _ event: REvent) {
func sendCriticalEvent(_ eventId: String, _ event: REvent, completion: (() -> Void?)? = nil) {
// Send the unique critical event immediately, and convert it to a warning type to prevent multiple alerts in server
var criticalEvent = event
eventsSender.sendEvents(events: [criticalEvent]) { result in
Expand All @@ -83,6 +84,7 @@ final class REventLoggerModule {
case .failure(let error):
Logger.debug(error)
}
completion?()
}
}

Expand Down
10 changes: 6 additions & 4 deletions Sources/REventLogger/REventLogger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ public final class REventLogger {
sourceVersion: String,
errorCode: String,
errorMessage: String,
info: [String: String]? = nil) {
info: [String: String]? = nil,
completion: (() -> Void?)? = nil) {
if isConfigured {
eventLogger?.logEvent(EventType.critical, sourceName, sourceVersion, errorCode, errorMessage, info)
eventLogger?.logEvent(EventType.critical, sourceName, sourceVersion, errorCode, errorMessage, info, completion)
}
}

Expand All @@ -83,9 +84,10 @@ public final class REventLogger {
sourceVersion: String,
errorCode: String,
errorMessage: String,
info: [String: String]? = nil) {
info: [String: String]? = nil,
completion: (() -> Void?)? = nil) {
if isConfigured {
eventLogger?.logEvent(EventType.warning, sourceName, sourceVersion, errorCode, errorMessage, info)
eventLogger?.logEvent(EventType.warning, sourceName, sourceVersion, errorCode, errorMessage, info, completion)
}
}

Expand Down
Loading