Skip to content

Commit db057b8

Browse files
authored
Release file lock on USR1 signal (#2151)
close #2136
1 parent 8f44ca3 commit db057b8

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

cmd/common/logger.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
package common
1616

1717
import (
18+
"io"
1819
"os"
1920

21+
"github.com/6543/logfile-open"
2022
"github.com/rs/zerolog"
2123
"github.com/rs/zerolog/log"
2224
"github.com/urfave/cli/v2"
@@ -55,14 +57,14 @@ func SetupGlobalLogger(c *cli.Context) {
5557
noColor := c.Bool("nocolor")
5658
logFile := c.String("log-file")
5759

58-
var file *os.File
60+
var file io.ReadWriteCloser
5961
switch logFile {
6062
case "", "stderr": // default case
6163
file = os.Stderr
6264
case "stdout":
6365
file = os.Stdout
6466
default: // a file was set
65-
openFile, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o660)
67+
openFile, err := logfile.OpenFileWithContext(c.Context, logFile, 0o660)
6668
if err != nil {
6769
log.Fatal().Err(err).Msgf("could not open log file '%s'", logFile)
6870
}

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ require (
66
code.gitea.io/sdk/gitea v0.15.1-0.20221016183512-2d9ee57af1e0
77
codeberg.org/6543/go-yaml2json v1.0.0
88
codeberg.org/6543/xyaml v1.1.0
9+
github.com/6543/logfile-open v1.1.1
910
github.com/alessio/shellescape v1.4.1
1011
github.com/antonmedv/expr v1.12.5
1112
github.com/bmatcuk/doublestar/v4 v4.6.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ gitea.com/6543/xorm v1.3.3-0.20230807141308-fc77a3b490a8/go.mod h1:qFJGFoVYbbIdn
1010
gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
1111
gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
1212
gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE=
13+
github.com/6543/logfile-open v1.1.1 h1:OKBz2GwxGaJRAOZehsSAl9antvHDG3yq83cpQcQ26aw=
14+
github.com/6543/logfile-open v1.1.1/go.mod h1:ZoEy7pW2mexmQxiZIqPCeh8vUxVuiHYXmSZNbvEb51g=
1315
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
1416
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
1517
github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=

0 commit comments

Comments
 (0)