latest

cmd/feta/identity.go

@@ -1,36 +0,0 @@
-package main
-
-import (
-	"github.com/rs/zerolog/log"
-)
-
-var Version string
-var Buildtime string
-var Builduser string
-var Buildarch string
-
-type AppIdentity struct {
-	Version   string
-	Buildtime string
-	Builduser string
-	Buildarch string
-}
-
-func GetAppIdentity() *AppIdentity {
-	i := new(AppIdentity)
-	i.Version = Version
-	i.Buildtime = Buildtime
-	i.Builduser = Builduser
-	i.Buildarch = Buildarch
-	return i
-}
-
-func identify() {
-	i := GetAppIdentity()
-	log.Info().
-		Str("version", i.Version).
-		Str("buildarch", i.Buildarch).
-		Str("buildtime", i.Buildtime).
-		Str("builduser", i.Builduser).
-		Msg("starting")
-}

cmd/feta/main.go

@@ -1,57 +1,15 @@
 package main
 
 import "os"
-import "sync"
-import "time"
-
-import "github.com/rs/zerolog"
-import "github.com/rs/zerolog/log"
-import "golang.org/x/crypto/ssh/terminal"
 
 import "github.com/sneak/feta"
 
+// these are filled in at link-time by the build scripts
+var Version string
+var Buildtime string
+var Builduser string
+var Buildarch string
+
 func main() {
-	os.Exit(app())
-}
-
-func app() int {
-	log.Logger = log.With().Caller().Logger()
-	if terminal.IsTerminal(int(os.Stdout.Fd())) {
-		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-	}
-
-	identify()
-
-	// always log in UTC
-	zerolog.TimestampFunc = func() time.Time {
-		return time.Now().UTC()
-	}
-
-	zerolog.SetGlobalLevel(zerolog.InfoLevel)
-	if os.Getenv("DEBUG") != "" {
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-	}
-
-	archiver := feta.NewTootArchiver()
-
-	api := new(feta.TootArchiverAPIServer)
-	api.SetArchiver(archiver)
-
-	var wg sync.WaitGroup
-
-	// start api webserver goroutine
-	wg.Add(1)
-	go func() {
-		api.Serve()
-		wg.Done()
-	}()
-
-	wg.Add(1)
-	go func() {
-		archiver.RunForever()
-		wg.Done()
-	}()
-
-	wg.Wait()
-	return 0
+	os.Exit(feta.CLIEntry(Version, Buildtime, Builduser, Buildarch))
 }