Test main

main.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/afero"
 	"gitlab.alpinelinux.org/Leo/aports-proxy-bot/conf"
 	"gitlab.alpinelinux.org/Leo/aports-proxy-bot/proxy"
@@ -18,35 +17,44 @@ import (
 
 // This can be replaced in the main_test portion
 var (
-	fs  afero.Fs     = afero.NewOsFs()
-	afs *afero.Afero = &afero.Afero{Fs: fs}
+	fs  afero.Fs       = afero.NewOsFs()
+	afs *afero.Afero   = &afero.Afero{Fs: fs}
+	log zerolog.Logger = zerolog.New(os.Stdout).Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339})
 )
 
-func main() {
-	// Make it pretty-print for Console
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339})
+func main() { os.Exit(do()) }
 
+func do() int {
 	config, err := load()
 	if err != nil {
-		log.Fatal().
+		log.Error().
 			Err(err).
 			Msg("failed to load configuration")
+		return 1
 	}
 
 	// Set the zerolog logging to this configuration level
 	level, err := zerolog.ParseLevel(config.LogLevel)
 	if err != nil {
-		log.Fatal().
+		log.Error().
 			Err(err).
 			Str("loglevel", config.LogLevel).
 			Msg("LogLevel in configuration is invalid")
+		return 1
 	}
 	zerolog.SetGlobalLevel(level)
 	log.Info().
 		Str("loglevel", level.String()).
 		Msg("set loglevel from configuration")
 
-	log.Fatal().Err(proxy.Serve(config))
+	err = proxy.Serve(config)
+	if err != nil {
+		log.Error().
+			Err(err).
+			Msg("failed to serve requests")
+		return 1
+	}
+	return 0
 }
 
 func load() (*conf.Options, error) {