From b3962cbe19910d14574600d96f75f503fc46c7ee Mon Sep 17 00:00:00 2001
From: Oskar Eichler <62393985+OskarEichler@users.noreply.github.com>
Date: Sun, 30 Aug 2026 15:28:46 +0700
Subject: [PATCH] Restore log modes after ownership during rotation

---
 lib/logger/log_device.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/logger/log_device.rb b/lib/logger/log_device.rb
index e16f3b7..08d7992 100644
--- a/lib/logger/log_device.rb
+++ b/lib/logger/log_device.rb
@@ -236,17 +236,17 @@ def shift_log_file(shifted)
       @dev = create_logfile(@filename)
       mode, uid, gid = stat.mode, stat.uid, stat.gid
       begin
-        @dev.chmod(mode) if mode
-        mode = nil
         @dev.chown(uid, gid)
       rescue Errno::EPERM
-        if mode
-          # failed to chmod, probably nothing can do more.
-        elsif uid
-          uid = nil
-          retry # to change gid only
+        begin
+          @dev.chown(nil, gid) if uid
+        rescue Errno::EPERM
         end
       end
+      begin
+        @dev.chmod(mode) if mode
+      rescue Errno::EPERM
+      end
       return true
     end
   end