diff --git a/cmd/root.go b/cmd/root.go index 86b889e..e61bd0a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,6 +6,7 @@ package cmd import ( "os" + "github.com/0xtux/trok/internal/config" "github.com/spf13/cobra" ) @@ -15,6 +16,10 @@ var rootCmd = &cobra.Command{ Long: "Simple TCP tunnel in Go that exposes local ports to internet, bypassing NAT firewalls.", } +func init() { + config.InitLogger() +} + func Execute() { rootCmd.CompletionOptions.HiddenDefaultCmd = true err := rootCmd.Execute() diff --git a/internal/client/init.go b/internal/client/init.go index 1a1792c..cc1e7cc 100644 --- a/internal/client/init.go +++ b/internal/client/init.go @@ -5,9 +5,9 @@ Copyright © 2024 tux <0xtux@pm.me> package client import ( - "log" + "github.com/rs/zerolog/log" ) func Start(port uint16) { - log.Printf("Hello from client: %d", port) + log.Info().Msgf("Hello from client: %d", port) } diff --git a/internal/config/logger.go b/internal/config/logger.go new file mode 100644 index 0000000..75672e4 --- /dev/null +++ b/internal/config/logger.go @@ -0,0 +1,30 @@ +/* +Copyright © 2024 tux <0xtux@pm.me> +*/ + +package config + +import ( + "os" + "time" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" +) + +func InitLogger() { + output := zerolog.ConsoleWriter{ + Out: os.Stdout, + TimeFormat: time.RFC3339, + NoColor: false, + } + + log.Logger = zerolog.New(output). + With(). + Timestamp(). + Caller(). + Stack(). + Logger() + + zerolog.SetGlobalLevel(zerolog.DebugLevel) +} diff --git a/internal/server/init.go b/internal/server/init.go index 794d338..a23aed5 100644 --- a/internal/server/init.go +++ b/internal/server/init.go @@ -5,9 +5,9 @@ Copyright © 2024 tux <0xtux@pm.me> package server import ( - "log" + "github.com/rs/zerolog/log" ) func Start(port uint16) { - log.Printf("Hello from server: %d", port) + log.Info().Msgf("Hello from server: %d", port) }