diff --git a/internal/config/testdata/file_system_config/invalid_ignore_interrupts.yaml b/internal/config/testdata/file_system_config/invalid_ignore_interrupts.yaml index 48d92a342a..a381313bf1 100644 --- a/internal/config/testdata/file_system_config/invalid_ignore_interrupts.yaml +++ b/internal/config/testdata/file_system_config/invalid_ignore_interrupts.yaml @@ -1,2 +1,2 @@ file-system: - ignore-interrupts: abc \ No newline at end of file + ignore-interrupts: abc diff --git a/internal/config/testdata/file_system_config/unset_ignore_interrupts.yaml b/internal/config/testdata/file_system_config/unset_ignore_interrupts.yaml index 1f4f4aea8e..4db0c34ced 100644 --- a/internal/config/testdata/file_system_config/unset_ignore_interrupts.yaml +++ b/internal/config/testdata/file_system_config/unset_ignore_interrupts.yaml @@ -1,2 +1,2 @@ write: - create-empty-file: true \ No newline at end of file + create-empty-file: true diff --git a/main.go b/main.go index 205b0006b4..1b318a7019 100644 --- a/main.go +++ b/main.go @@ -224,6 +224,7 @@ func runCLIApp(c *cli.Context) (err error) { config.OverrideWithLoggingFlags(mountConfig, flags.LogFile, flags.LogFormat, flags.DebugFuse, flags.DebugGCS, flags.DebugMutex) config.OverrideWithIgnoreInterruptsFlag(c, mountConfig, flags.IgnoreInterrupts) + // Ideally this call to SetLogFormat (which internally creates a new defaultLogger) // should be set as an else to the 'if flags.Foreground' check below, but currently // that means the logs generated by resolveConfigFilePaths below don't honour