Skip to content

Commit fcf3f66

Browse files
committed
♻️ refactor: update codebase #2
1 parent 19d12ac commit fcf3f66

2 files changed

Lines changed: 23 additions & 16 deletions

File tree

chain.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,20 +191,20 @@ func DefaultEventCallbackChain() func(event EventKey, level EventLevel, response
191191
return func(event EventKey, level EventLevel, response wrapify.R) {
192192
switch level {
193193
case EventLevelDebug:
194-
loggy.Debugf("[pgc.event] event=%s | request_id=%s | status=%d | message=%s",
195-
event, response.Meta().RequestID(), response.StatusCode(), response.Message())
194+
loggy.Debugf("[pgc.event] event=%s | request_id=%s | status=%s | message=%s",
195+
event, response.Meta().RequestID(), response.StatusText(), response.Message())
196196
case EventLevelInfo:
197-
loggy.Infof("[pgc.event] event=%s | request_id=%s | status=%d | message=%s",
198-
event, response.Meta().RequestID(), response.StatusCode(), response.Message())
197+
loggy.Infof("[pgc.event] event=%s | request_id=%s | status=%s | message=%s",
198+
event, response.Meta().RequestID(), response.StatusText(), response.Message())
199199
case EventLevelWarn:
200-
loggy.Warnf("[pgc.event] event=%s | request_id=%s | status=%d | message=%s",
201-
event, response.Meta().RequestID(), response.StatusCode(), response.Message())
200+
loggy.Warnf("[pgc.event] event=%s | request_id=%s | status=%s | message=%s",
201+
event, response.Meta().RequestID(), response.StatusText(), response.Message())
202202
case EventLevelError:
203-
loggy.Errorf("[pgc.event] event=%s | request_id=%s | status=%d | message=%s",
204-
event, response.Meta().RequestID(), response.StatusCode(), response.Message())
203+
loggy.Errorf("[pgc.event] event=%s | request_id=%s | status=%s | message=%s",
204+
event, response.Meta().RequestID(), response.StatusText(), response.Message())
205205
default:
206-
loggy.Infof("[pgc.event] event=%s | request_id=%s | status=%d | message=%s",
207-
event, response.Meta().RequestID(), response.StatusCode(), response.Message())
206+
loggy.Infof("[pgc.event] event=%s | request_id=%s | status=%s | message=%s",
207+
event, response.Meta().RequestID(), response.StatusText(), response.Message())
208208
}
209209
}
210210
}

pgc.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,6 @@ func (d *Datasource) dispatch_reconnect(response wrapify.R, chain *Datasource) {
284284
// to dispatch_event external components of significant events (e.g., transaction starts, commits, rollbacks)
285285
// without blocking the calling goroutine, ensuring that notification handling is performed concurrently.
286286
func (d *Datasource) dispatch_event(event EventKey, level EventLevel, response wrapify.R) {
287-
loggy.Infof("Dispatching event: %s at level: %s, IsEventEnabled: %v",
288-
event.String(), level.String(), d.IsEventEnabled())
289287
if !d.IsEventEnabled() {
290288
return
291289
}
@@ -294,11 +292,20 @@ func (d *Datasource) dispatch_event(event EventKey, level EventLevel, response w
294292
callback := d.on_event
295293
d.mu.RUnlock()
296294

297-
loggy.Infof("Event callback retrieved: %v", callback != nil)
298-
if callback != nil {
299-
loggy.Infof("Invoking event callback for event: %s", event.String())
300-
go callback(event, level, response)
295+
if callback == nil {
296+
return
297+
}
298+
299+
safeCallback := func() {
300+
defer func() {
301+
if r := recover(); r != nil {
302+
loggy.Errorf("[pgc.event] panic recovered in event callback: event=%s, level=%s, error=%v",
303+
event.String(), level.String(), r)
304+
}
305+
}()
306+
callback(event, level, response)
301307
}
308+
safeCallback()
302309
}
303310

304311
// inspect records a query inspection and dispatches it to the inspector if enabled.

0 commit comments

Comments
 (0)