Merge pull request #7 from bitechdev/copilot/sub-pr-5-again

Fix recover() not working in CatchPanic functions

pkg/errortracking/README.md

@@ -90,12 +90,12 @@ Panics are automatically captured when using the logger's panic handlers:
 
 ```go
 // Using CatchPanic
-defer logger.CatchPanic("MyFunction")
+defer logger.CatchPanic("MyFunction")()
 
 // Using CatchPanicCallback
 defer logger.CatchPanicCallback("MyFunction", func(err any) {
     // Custom cleanup
-})
+})()
 
 // Using HandlePanic
 defer func() {

pkg/logger/logger.go

@@ -148,8 +148,11 @@ func Debug(template string, args ...interface{}) {
 }
 
 // CatchPanic - Handle panic
-func CatchPanicCallback(location string, cb func(err any), args ...interface{}) {
+// Returns a function that should be deferred to catch panics
+// Example usage: defer CatchPanicCallback("MyFunction", func(err any) { /* cleanup */ })()
+func CatchPanicCallback(location string, cb func(err any), args ...interface{}) func() {
 	ctx, _ := extractContext(args...)
+	return func() {
 		if err := recover(); err != nil {
 			callstack := debug.Stack()
 
@@ -173,10 +176,13 @@ func CatchPanicCallback(location string, cb func(err any), args ...interface{})
 			}
 		}
 	}
+}
 
 // CatchPanic - Handle panic
-func CatchPanic(location string, args ...interface{}) {
-	CatchPanicCallback(location, nil, args...)
+// Returns a function that should be deferred to catch panics
+// Example usage: defer CatchPanic("MyFunction")()
+func CatchPanic(location string, args ...interface{}) func() {
+	return CatchPanicCallback(location, nil, args...)
 }
 
 // HandlePanic logs a panic and returns it as an error

pkg/security/provider.go

@@ -296,7 +296,7 @@ func setColSecValue(fieldsrc reflect.Value, colsec ColumnSecurity, fieldTypeName
 }
 
 func (m *SecurityList) ApplyColumnSecurity(records reflect.Value, modelType reflect.Type, pUserID int, pSchema, pTablename string) (reflect.Value, error) {
-	defer logger.CatchPanic("ApplyColumnSecurity")
+	defer logger.CatchPanic("ApplyColumnSecurity")()
 
 	if m.ColumnSecurity == nil {
 		return records, fmt.Errorf("security not initialized")
@@ -437,7 +437,7 @@ func (m *SecurityList) LoadRowSecurity(ctx context.Context, pUserID int, pSchema
 }
 
 func (m *SecurityList) GetRowSecurityTemplate(pUserID int, pSchema, pTablename string) (RowSecurity, error) {
-	defer logger.CatchPanic("GetRowSecurityTemplate")
+	defer logger.CatchPanic("GetRowSecurityTemplate")()
 
 	if m.RowSecurity == nil {
 		return RowSecurity{}, fmt.Errorf("security not initialized")