Skip to content

Commit 326c254

Browse files
committed
add level parameter
1 parent 38331bf commit 326c254

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

internal/app/gui/gui.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
func Main(assets embed.FS) error {
17-
logger, lumberjackLogger := log.InitLog()
17+
logger, lumberjackLogger := log.InitLog(slog.LevelError)
1818
defer lumberjackLogger.Close()
1919

2020
app := &App{}

internal/app/package/main.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"embed"
5+
"log/slog"
56
"net/netip"
67

78
"github.com/alecthomas/kong"
@@ -30,11 +31,12 @@ func main() {
3031
if ctx.Error != nil {
3132
panic(ctx.Error)
3233
}
34+
3335
// init log
34-
logger, lumberjackLogger := log.InitLog()
36+
logger, lumberjackLogger := log.InitLog(slog.LevelDebug)
3537
defer lumberjackLogger.Close()
3638

37-
//从assets读取脚本文件
39+
//read script file from the assets
3840
scriptFile, err := assets.ReadFile("assets/default.yaml")
3941
if err != nil {
4042
panic(err)
@@ -55,7 +57,7 @@ func main() {
5557
})
5658
}
5759

58-
// 重写rscript.uploadFile 从assets上传文件
60+
// Rewrite rscript.uploadFile to upload files from the assets.
5961
engin.SetInternalFunc("rscript.uploadFile", engin.UploadFileWithFs(assets))
6062

6163
program := tview.NewProgram(nil)

internal/app/tui/tui.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tui
22

33
import (
4+
"log/slog"
45
"os"
56

67
"github.com/leijux/rscript/internal/pkg/engin"
@@ -11,7 +12,7 @@ import (
1112
const defaultConfig = "./default.yaml"
1213

1314
func Main() {
14-
logger, lumberjackLogger := log.InitLog()
15+
logger, lumberjackLogger := log.InitLog(slog.LevelError)
1516
defer lumberjackLogger.Close()
1617

1718
var (

internal/pkg/engin/engin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ func execExternalCommand(client *ssh.Client, command string) (string, error) {
173173
return "", err
174174
}
175175
defer session.Close()
176-
output, err := session.CombinedOutput(command)
177176

177+
output, err := session.CombinedOutput(command)
178178
return string(output), err
179179
}
180180

internal/pkg/log/log.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/leijux/rscript/internal/pkg/version"
1111
)
1212

13-
func InitLog() (*slog.Logger, *lumberjack.Logger) {
13+
func InitLog(level slog.Level) (*slog.Logger, *lumberjack.Logger) {
1414
lumberjackLogger := &lumberjack.Logger{
1515
Filename: "./logs/rscript.log",
1616
MaxSize: 100, // megabytes
@@ -20,10 +20,10 @@ func InitLog() (*slog.Logger, *lumberjack.Logger) {
2020
}
2121

2222
zerologLogger := zerolog.New(lumberjackLogger)
23-
logger := slog.New(slogzerolog.Option{Level: slog.LevelInfo, Logger: &zerologLogger}.NewZerologHandler()).
23+
logger := slog.New(slogzerolog.Option{Level: level, Logger: &zerologLogger}.NewZerologHandler()).
2424
With("version", version.Version)
2525

2626
slog.SetDefault(logger)
27-
27+
2828
return logger, lumberjackLogger
2929
}

0 commit comments

Comments
 (0)