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

feat: Add basic structured logger

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-28 21:05:43 +01:00
parent 7befc67ffc
commit 6837f6bc05
19 changed files with 245 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/stfs/cmd/inventory_find.go
View File

@@ -34,7 +34,7 @@ var inventoryFindCmd = &cobra.Command{
viper.GetString(expressionFlag),
logging.NewLogger().PrintHeader,
logging.NewCSVLogger().PrintHeader,
); err != nil {
return err
}

2
cmd/stfs/cmd/inventory_list.go
View File

@@ -35,7 +35,7 @@ var inventoryListCmd = &cobra.Command{
viper.GetString(nameFlag),
viper.GetInt(limitFlag),
logging.NewLogger().PrintHeader,
logging.NewCSVLogger().PrintHeader,
); err != nil {
return err
}

2
cmd/stfs/cmd/inventory_stat.go
View File

@@ -30,7 +30,7 @@ var inventoryStatCmd = &cobra.Command{
viper.GetString(nameFlag),
logging.NewLogger().PrintHeader,
logging.NewCSVLogger().PrintHeader,
); err != nil {
return err
}

2
cmd/stfs/cmd/operation_archive.go
View File

@@ -106,7 +106,7 @@ var operationArchiveCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
logging.NewLogger().PrintHeaderEvent,
logging.NewCSVLogger().PrintHeaderEvent,
)
files := make(chan config.FileConfig)

2
cmd/stfs/cmd/operation_delete.go
View File

@@ -89,7 +89,7 @@ var operationDeleteCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
logging.NewLogger().PrintHeaderEvent,
logging.NewCSVLogger().PrintHeaderEvent,
)
return ops.Delete(viper.GetString(nameFlag))

2
cmd/stfs/cmd/operation_move.go
View File

@@ -85,7 +85,7 @@ var operationMoveCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
logging.NewLogger().PrintHeaderEvent,
logging.NewCSVLogger().PrintHeaderEvent,
)
return ops.Move(viper.GetString(fromFlag), viper.GetString(toFlag))

2
cmd/stfs/cmd/operation_restore.go
View File

@@ -93,7 +93,7 @@ var operationRestoreCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
logging.NewLogger().PrintHeaderEvent,
logging.NewCSVLogger().PrintHeaderEvent,
)
return ops.Restore(

2
cmd/stfs/cmd/operation_update.go
View File

@@ -96,7 +96,7 @@ var operationUpdateCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
logging.NewLogger().PrintHeaderEvent,
logging.NewCSVLogger().PrintHeaderEvent,
)
files := make(chan config.FileConfig)

2
cmd/stfs/cmd/recovery_fetch.go
View File

@@ -106,7 +106,7 @@ var recoveryFetchCmd = &cobra.Command{
viper.GetString(toFlag),
viper.GetBool(previewFlag),
logging.NewLogger().PrintHeader,
logging.NewCSVLogger().PrintHeader,
)
},
}

2
cmd/stfs/cmd/recovery_index.go
View File

@@ -99,7 +99,7 @@ var recoveryIndexCmd = &cobra.Command{
return signature.VerifyHeader(hdr, isRegular, viper.GetString(signatureFlag), recipient)
},
logging.NewLogger().PrintHeader,
logging.NewCSVLogger().PrintHeader,
)
},
}

2
cmd/stfs/cmd/recovery_query.go
View File

@@ -73,7 +73,7 @@ var recoveryQueryCmd = &cobra.Command{
viper.GetInt(recordFlag),
viper.GetInt(blockFlag),
logging.NewLogger().PrintHeader,
logging.NewCSVLogger().PrintHeader,
); err != nil {
return err
}

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

@@ -3,7 +3,6 @@ package cmd
import (
"context"
"fmt"
"log"
"os"
"path/filepath"
"time"
@@ -126,7 +125,8 @@ var serveFTPCmd = &cobra.Command{
return err
}
logger := logging.NewLogger()
csvLogger := logging.NewCSVLogger()
structuredLogger := logging.NewJSONLogger()
readOps := operations.NewOperations(
config.BackendConfig{
@@ -155,7 +155,7 @@ var serveFTPCmd = &cobra.Command{
Password: viper.GetString(encryptionPasswordFlag),
},
logger.PrintHeaderEvent,
csvLogger.PrintHeaderEvent,
)
writeOps := operations.NewOperations(
@@ -185,7 +185,7 @@ var serveFTPCmd = &cobra.Command{
Password: viper.GetString(signaturePasswordFlag),
},
logger.PrintHeaderEvent,
csvLogger.PrintHeaderEvent,
)
stfs := sfs.NewFileSystem(
@@ -205,7 +205,8 @@ var serveFTPCmd = &cobra.Command{
},
true, // FTP needs read permission for `STOR` command even if O_WRONLY is set
logger.PrintHeader,
csvLogger.PrintHeader,
structuredLogger,
)
fs, err := cache.NewCacheFilesystem(
@@ -229,10 +230,12 @@ var serveFTPCmd = &cobra.Command{
)
if viper.GetBool(verboseFlag) {
srv.Logger = &ftp.Logger{}
srv.Logger = &logging.JSONLogger{}
}
log.Println("Listening on", viper.GetString(laddrFlag))
structuredLogger.Info("HTTP server listening", map[string]interface{}{
"laddr": viper.GetString(laddrFlag),
})
return srv.ListenAndServe()
},

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

@@ -3,7 +3,6 @@ package cmd
import (
"context"
"fmt"
"log"
"net/http"
"path/filepath"
"time"
@@ -85,7 +84,8 @@ var serveHTTPCmd = &cobra.Command{
return err
}
logger := logging.NewLogger()
csvLogger := logging.NewCSVLogger()
structuredLogger := logging.NewJSONLogger()
readOps := operations.NewOperations(
config.BackendConfig{
@@ -114,7 +114,7 @@ var serveHTTPCmd = &cobra.Command{
Password: viper.GetString(passwordFlag),
},
logger.PrintHeaderEvent,
csvLogger.PrintHeaderEvent,
)
stfs := sfs.NewFileSystem(
@@ -129,7 +129,8 @@ var serveHTTPCmd = &cobra.Command{
nil, // We never write
false, // We never write
logger.PrintHeader,
csvLogger.PrintHeader,
structuredLogger,
)
fs, err := cache.NewCacheFilesystem(
@@ -143,7 +144,9 @@ var serveHTTPCmd = &cobra.Command{
return err
}
log.Println("Listening on", viper.GetString(laddrFlag))
structuredLogger.Info("FTP server listening", map[string]interface{}{
"laddr": viper.GetString(laddrFlag),
})
return http.ListenAndServe(
viper.GetString(laddrFlag),