Fatal calls exit, Panic calls panic

Author: huykingsofm

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.5.0 (Jan 13, 2023)
+
+-   Fatal calls to os.Exit(1).
+-   Panic calls to panic().
+
 # v0.4.1 (Jan 6, 2023)
 
 -   Change name of NewStreamEmitter to NewBufferEmitter.

config.go

@@ -44,7 +44,6 @@ func init() {
 const (
 	NOTLOG   = 1000
 	CRITICAL = 50
-	FATAL    = CRITICAL
 	ERROR    = 40
 	WARNING  = 30
 	WARN     = WARNING

event_logger.go

@@ -20,7 +20,10 @@
 
 package xylog
 
-import "sync"
+import (
+	"os"
+	"sync"
+)
 
 var eventLoggerPool = sync.Pool{
 	New: func() any {
@@ -81,14 +84,6 @@ func (e *EventLogger) Error() {
 	}
 }
 
-// Fatal calls Log with FATAL level.
-func (e *EventLogger) Fatal() {
-	defer e.free()
-	if e.lg.isEnabledFor(FATAL) {
-		e.lg.log(FATAL, e.fields...)
-	}
-}
-
 // Critical calls Log with CRITICAL level.
 func (e *EventLogger) Critical() {
 	defer e.free()
@@ -97,6 +92,18 @@ func (e *EventLogger) Critical() {
 	}
 }
 
+// Fatal calls Log with CRITICAL level, then followed by a call to os.Exit(1).
+func (e *EventLogger) Fatal() {
+	e.Critical()
+	os.Exit(1)
+}
+
+// Panic calls Log with CRITICAL level, then followed by a call to panic().
+func (e *EventLogger) Panic() {
+	e.Critical()
+	panic(nil)
+}
+
 // Log logs with a custom level.
 func (e *EventLogger) Log(level int) {
 	defer e.free()

event_logger_test.go

@@ -60,7 +60,7 @@ func TestEventLogger(t *testing.T) {
 			Test(t)
 
 		w.Reset()
-		logger.Event(msg).Fatal()
+		xycond.ExpectPanic(nil, logger.Event(msg).Panic).Test(t)
 		xycond.ExpectIn(fmt.Sprintf("event=\"%s\"", msg), w.Captured).
 			Test(t)
 

logger.go

@@ -22,6 +22,7 @@ package xylog
 
 import (
 	"fmt"
+	"os"
 	"runtime/debug"
 	"strings"
 
@@ -243,20 +244,6 @@ func (lg *Logger) Errorf(s string, a ...any) {
 	}
 }
 
-// Fatal logs default formatting objects with FATAL level.
-func (lg *Logger) Fatal(s string) {
-	if lg.isEnabledFor(FATAL) {
-		lg.log(FATAL, makeField("messsage", s))
-	}
-}
-
-// Fatalf logs a formatting message with FATAL level.
-func (lg *Logger) Fatalf(s string, a ...any) {
-	if lg.isEnabledFor(FATAL) {
-		lg.log(FATAL, makeField("messsage", fmt.Sprintf(s, a...)))
-	}
-}
-
 // Critical logs default formatting objects with CRITICAL level.
 func (lg *Logger) Critical(s string) {
 	if lg.isEnabledFor(CRITICAL) {
@@ -271,6 +258,34 @@ func (lg *Logger) Criticalf(s string, a ...any) {
 	}
 }
 
+// Fatal logs default formatting objects with CRITICAL level, then followed by a
+// call to os.Exit(1).
+func (lg *Logger) Fatal(s string) {
+	lg.Critical(s)
+	os.Exit(1)
+}
+
+// Fatalf logs a formatting message with CRITICAL level, then followed by a call
+// to os.Exit(1).
+func (lg *Logger) Fatalf(s string, a ...any) {
+	lg.Criticalf(s, a...)
+	os.Exit(1)
+}
+
+// Panic logs default formatting objects with CRITICAL level, then followed by a
+// call to panic().
+func (lg *Logger) Panic(s string) {
+	lg.Critical(s)
+	panic(s)
+}
+
+// Panicf logs a formatting message with CRITICAL level, then followed by a call
+// to panic().
+func (lg *Logger) Panicf(s string, a ...any) {
+	lg.Criticalf(s, a...)
+	panic(fmt.Sprintf(s, a...))
+}
+
 // Log logs default formatting objects with a custom level.
 func (lg *Logger) Log(level int, s string) {
 	level = CheckLevel(level)

logger_test.go

@@ -49,7 +49,6 @@ func TestLoggerLogMethods(t *testing.T) {
 			{logger.Warnf, logger.Warn},
 			{logger.Warningf, logger.Warning},
 			{logger.Errorf, logger.Error},
-			{logger.Fatalf, logger.Fatal},
 			{logger.Criticalf, logger.Critical},
 		}
 
@@ -181,7 +180,7 @@ func TestLoggerFindCaller(t *testing.T) {
 
 		logger.Error("foo")
 
-		xycond.ExpectIn("lineno=182", w.Captured).Test(t)
+		xycond.ExpectIn("lineno=181", w.Captured).Test(t)
 		xycond.ExpectIn(
 			"module=github.com/xybor-x/xylog_test", w.Captured).Test(t)
 		xycond.ExpectIn(