From 7f4c099027f96ab9242929b120967fa5a972205c Mon Sep 17 00:00:00 2001
From: DarthSim <darthsim@gmail.com>
Date: Wed, 2 Oct 2024 23:25:46 +0300
Subject: [PATCH] Fix loading log configs from local files and secret managers

---
 CHANGELOG.md  | 4 ++++
 logger/log.go | 7 +++++++
 main.go       | 8 ++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c303c25..eb0ce1ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+### Fix
+- Fix loading log configs from local files and secret managers.
+
 ## [3.26.0] - 2024-09-16
 # Add
 - Add `imgproxy.source_image_url` and `imgproxy.processing_options` attributes to New Relic, DataDog, and OpenTelemetry traces.
diff --git a/logger/log.go b/logger/log.go
index 02ba9926..4d26be37 100644
--- a/logger/log.go
+++ b/logger/log.go
@@ -9,6 +9,13 @@ import (
 	"github.com/imgproxy/imgproxy/v3/config/configurators"
 )
 
+func init() {
+	// Configure logrus so it can be used before Init().
+	// Structured formatter is a compromise between JSON and pretty formatters.
+	logrus.SetOutput(os.Stdout)
+	logrus.SetFormatter(&structuredFormatter{})
+}
+
 func Init() error {
 	logrus.SetOutput(os.Stdout)
 
diff --git a/main.go b/main.go
index 5f076f51..2b490f90 100644
--- a/main.go
+++ b/main.go
@@ -28,6 +28,10 @@ import (
 )
 
 func initialize() error {
+	if err := loadenv.Load(); err != nil {
+		return err
+	}
+
 	if err := logger.Init(); err != nil {
 		return err
 	}
@@ -36,10 +40,6 @@ func initialize() error {
 
 	maxprocs.Set(maxprocs.Logger(log.Debugf))
 
-	if err := loadenv.Load(); err != nil {
-		return err
-	}
-
 	if err := config.Configure(); err != nil {
 		return err
 	}