Add version to ui

This commit is contained in:
Jannis Mattheis
2020-10-04 19:44:26 +02:00
parent ee0a831174
commit 56189c99ea
6 changed files with 42 additions and 31 deletions

View File

@@ -17,39 +17,41 @@ import (
"github.com/urfave/cli"
)
var serveCmd = cli.Command{
Name: "serve",
Action: func(ctx *cli.Context) {
func serveCmd(version string) cli.Command {
return cli.Command{
Name: "serve",
Action: func(ctx *cli.Context) {
mrand.Seed(time.Now().Unix())
conf, errs := config.Get()
logger.Init(conf.LogLevel.AsZeroLogLevel())
mrand.Seed(time.Now().Unix())
conf, errs := config.Get()
logger.Init(conf.LogLevel.AsZeroLogLevel())
exit := false
for _, err := range errs {
log.WithLevel(err.Level).Msg(err.Msg)
exit = exit || err.Level == zerolog.FatalLevel || err.Level == zerolog.PanicLevel
}
if exit {
os.Exit(1)
}
users, err := auth.ReadPasswordsFile(conf.UsersFile, conf.Secret)
if err != nil {
log.Fatal().Str("file", conf.UsersFile).Err(err).Msg("While loading users file")
}
exit := false
for _, err := range errs {
log.WithLevel(err.Level).Msg(err.Msg)
exit = exit || err.Level == zerolog.FatalLevel || err.Level == zerolog.PanicLevel
}
if exit {
os.Exit(1)
}
users, err := auth.ReadPasswordsFile(conf.UsersFile, conf.Secret)
if err != nil {
log.Fatal().Str("file", conf.UsersFile).Err(err).Msg("While loading users file")
}
auth, err := turn.Start(conf)
if err != nil {
log.Fatal().Err(err).Msg("could not start turn server")
}
auth, err := turn.Start(conf)
if err != nil {
log.Fatal().Err(err).Msg("could not start turn server")
}
rooms := ws.NewRooms(auth, users, conf)
rooms := ws.NewRooms(auth, users, conf)
go rooms.Start()
go rooms.Start()
r := router.Router(conf, rooms, users)
if err := server.Start(r, conf.ServerAddress, conf.TLSCertFile, conf.TLSKeyFile); err != nil {
log.Fatal().Err(err).Msg("http server")
}
},
r := router.Router(conf, rooms, users, version)
if err := server.Start(r, conf.ServerAddress, conf.TLSCertFile, conf.TLSKeyFile); err != nil {
log.Fatal().Err(err).Msg("http server")
}
},
}
}