Merge branch 'sh-fix-log-permission-error' into 'main'

Fix gitlab-shell panic when log file not writable

See merge request gitlab-org/gitlab-shell!453

1 files changed, 14 insertions, 0 deletions

diff --git a/internal/logger/logger_test.go b/internal/logger/logger_test.go
index 8b28b37..9bffad2 100644
--- a/internal/logger/logger_test.go
+++ b/internal/logger/logger_test.go
@@ -30,3 +30,17 @@ func TestConfigure(t *testing.T) {
 	require.NoError(t, err)
 	require.True(t, strings.Contains(string(data), `msg":"this is a test"`))
 }
+
+func TestConfigureWithPermissionError(t *testing.T) {
+	tmpPath, err := ioutil.TempDir(os.TempDir(), "logtest-")
+	require.NoError(t, err)
+	defer os.RemoveAll(tmpPath)
+
+	config := config.Config{
+		LogFile:   tmpPath,
+		LogFormat: "json",
+	}
+
+	Configure(&config)
+	log.Info("this is a test")
+}