Merge branch 'development' into fix/subscriber-error-swallowed

Author: Umang01-hash

pkg/gofr/gofr.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
 	"os"
@@ -110,12 +111,13 @@ func (a *App) Shutdown(ctx context.Context) error {
 		err = errors.Join(err, a.metricServer.Shutdown(ctx))
 	}
 
-	if err != nil {
-		return err
-	}
-
 	a.container.Logger.Info("Application shutdown complete")
 
+	// Close logger file if applicable
+	if closer, ok := a.container.Logger.(io.Closer); ok {
+		err = errors.Join(err, closer.Close())
+	}
+
 	return err
 }
 

pkg/gofr/gofr_test.go

@@ -40,6 +40,40 @@ func TestNewCMD(t *testing.T) {
 	assert.Contains(t, outputWithoutArgs, "is not a valid command", "TEST Failed.\n%s", "Stderr output mismatch")
 }
 
+func TestNewCMD_FileLoggerClosedAfterRun(t *testing.T) {
+	tempFile, err := os.CreateTemp(t.TempDir(), "gofr_cmd_test_log_*.log")
+	require.NoError(t, err)
+
+	tempFile.Close() // Close it since NewFileLogger will open it.
+	t.Setenv("CMD_LOGS_FILE", tempFile.Name())
+
+	originalArgs := os.Args
+	os.Args = []string{"", "test-log"}
+
+	t.Cleanup(func() { os.Args = originalArgs })
+
+	a := NewCMD()
+
+	a.SubCommand("test-log", func(c *Context) (any, error) {
+		c.Logger.Info("test log message in cmd")
+		return "handler called", nil
+	})
+
+	a.Run()
+
+	logBytes, err := os.ReadFile(tempFile.Name())
+	require.NoError(t, err)
+
+	assert.Contains(t, string(logBytes), "test log message in cmd")
+
+	// Verify the logger is closed by checking if another Close() call returns an error.
+	closer, ok := a.container.Logger.(io.Closer)
+	require.True(t, ok, "logger should implement io.Closer")
+
+	err = closer.Close()
+	assert.ErrorIs(t, err, os.ErrClosed)
+}
+
 func TestGofr_readConfig(t *testing.T) {
 	app := App{}
 

pkg/gofr/logging/logger.go

@@ -47,6 +47,7 @@ type logger struct {
 	errorOut   io.Writer
 	isTerminal bool
 	lock       chan struct{}
+	file       *os.File
 }
 
 type logEntry struct {
@@ -144,8 +145,8 @@ func (l *logger) Fatal(args ...any) {
 	l.logf(FATAL, "", args...)
 
 	// Flush output before exiting
-	if f, ok := l.errorOut.(*os.File); ok {
-		_ = f.Sync() // Ignore sync error as we're about to exit
+	if l.file != nil {
+		_ = l.file.Sync() // Ignore sync error as we're about to exit
 	}
 
 	//nolint:revive // exit status is 1 as it denotes failure as signified by Fatal log
@@ -156,8 +157,8 @@ func (l *logger) Fatalf(format string, args ...any) {
 	l.logf(FATAL, format, args...)
 
 	// Flush output before exiting
-	if f, ok := l.errorOut.(*os.File); ok {
-		_ = f.Sync() // Ignore sync error as we're about to exit
+	if l.file != nil {
+		_ = l.file.Sync() // Ignore sync error as we're about to exit
 	}
 
 	//nolint:revive // exit status is 1 as it denotes failure as signified by Fatal log
@@ -227,10 +228,19 @@ func NewFileLogger(path string) Logger {
 
 	l.normalOut = f
 	l.errorOut = f
+	l.file = f
 
 	return l
 }
 
+func (l *logger) Close() error {
+	if l.file != nil {
+		return l.file.Close()
+	}
+
+	return nil
+}
+
 func checkIfTerminal(w io.Writer) bool {
 	// Force JSON output in test environments
 	if os.Getenv("GOFR_EXITER") == "1" {

pkg/gofr/logging/logger_test.go

@@ -281,3 +281,22 @@ func TestNewFileLogger_NilPath(t *testing.T) {
 	assert.Equal(t, io.Discard, logger.normalOut)
 	assert.Equal(t, io.Discard, logger.errorOut)
 }
+
+func TestNewFileLogger_Close(t *testing.T) {
+	tempFile, err := os.CreateTemp(t.TempDir(), "gofr_test_log_*.log")
+	require.NoError(t, err)
+
+	tempFile.Close() // Close it since NewFileLogger will open it.
+
+	l := NewFileLogger(tempFile.Name())
+
+	closer, ok := l.(io.Closer)
+	require.True(t, ok, "logger should implement io.Closer")
+
+	err = closer.Close()
+	require.NoError(t, err)
+
+	// verify that subsequent Close calls do not panic
+	err = closer.Close()
+	assert.ErrorIs(t, err, os.ErrClosed)
+}

pkg/gofr/run.go

@@ -3,6 +3,7 @@ package gofr
 import (
 	"context"
 	"errors"
+	"io"
 	"net/http"
 	"os"
 	"os/signal"
@@ -15,6 +16,12 @@ import (
 func (a *App) Run() {
 	if a.cmd != nil {
 		a.cmd.Run(a.container)
+
+		if closer, ok := a.container.Logger.(io.Closer); ok {
+			closer.Close()
+		}
+
+		return
 	}
 
 	// Create a context that is canceled on receiving termination signals