mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Use exclusively CSV or JSON logger

Browse Source
This commit is contained in:
Felix Pojtinger
2021-12-28 21:16:43 +01:00
parent 2d6343d6ae
commit eb74151c59
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/stfs/cmd/serve_ftp.go
View File

@@ -9,6 +9,7 @@ import (
ftpserver "github.com/fclairamb/ftpserverlib"
"github.com/pojntfx/stfs/internal/cache"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
sfs "github.com/pojntfx/stfs/internal/fs"
"github.com/pojntfx/stfs/internal/ftp"
"github.com/pojntfx/stfs/internal/keys"
@@ -125,8 +126,7 @@ var serveFTPCmd = &cobra.Command{
return err
}
csvLogger := logging.NewCSVLogger()
structuredLogger := logging.NewJSONLogger()
jsonLogger := logging.NewJSONLogger()
readOps := operations.NewOperations(
config.BackendConfig{
@@ -155,7 +155,9 @@ var serveFTPCmd = &cobra.Command{
Password: viper.GetString(encryptionPasswordFlag),
},
csvLogger.PrintHeaderEvent,
func(event *config.HeaderEvent) {
jsonLogger.Debug("Header read", event)
},
)
writeOps := operations.NewOperations(
@@ -185,7 +187,9 @@ var serveFTPCmd = &cobra.Command{
Password: viper.GetString(signaturePasswordFlag),
},
csvLogger.PrintHeaderEvent,
func(event *config.HeaderEvent) {
jsonLogger.Debug("Header write", event)
},
)
stfs := sfs.NewFileSystem(
@@ -205,8 +209,10 @@ var serveFTPCmd = &cobra.Command{
},
true, // FTP needs read permission for `STOR` command even if O_WRONLY is set
csvLogger.PrintHeader,
structuredLogger,
func(hdr *models.Header) {
jsonLogger.Debug("Header transform", hdr)
},
jsonLogger,
)
fs, err := cache.NewCacheFilesystem(
@@ -233,7 +239,7 @@ var serveFTPCmd = &cobra.Command{
srv.Logger = &logging.JSONLogger{}
}
structuredLogger.Info("HTTP server listening", map[string]interface{}{
jsonLogger.Info("FTP server listening", map[string]interface{}{
"laddr": viper.GetString(laddrFlag),
})

16
cmd/stfs/cmd/serve_http.go
View File

@@ -8,6 +8,7 @@ import (
"time"
"github.com/pojntfx/stfs/internal/cache"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
sfs "github.com/pojntfx/stfs/internal/fs"
"github.com/pojntfx/stfs/internal/handlers"
"github.com/pojntfx/stfs/internal/keys"
@@ -84,8 +85,7 @@ var serveHTTPCmd = &cobra.Command{
return err
}
csvLogger := logging.NewCSVLogger()
structuredLogger := logging.NewJSONLogger()
jsonLogger := logging.NewJSONLogger()
readOps := operations.NewOperations(
config.BackendConfig{
@@ -114,7 +114,9 @@ var serveHTTPCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
csvLogger.PrintHeaderEvent,
func(event *config.HeaderEvent) {
jsonLogger.Debug("Header read", event)
},
)
stfs := sfs.NewFileSystem(
@@ -129,8 +131,10 @@ var serveHTTPCmd = &cobra.Command{
nil, // We never write
false, // We never write
csvLogger.PrintHeader,
structuredLogger,
func(hdr *models.Header) {
jsonLogger.Debug("Header transform", hdr)
},
jsonLogger,
)
fs, err := cache.NewCacheFilesystem(
@@ -144,7 +148,7 @@ var serveHTTPCmd = &cobra.Command{
return err
}
structuredLogger.Info("FTP server listening", map[string]interface{}{
jsonLogger.Info("HTTP server listening", map[string]interface{}{
"laddr": viper.GetString(laddrFlag),
})