update startup logging

This commit is contained in:
wish
2023-03-05 22:24:33 +11:00
parent 1ab452fda7
commit cfe6bd118c

20
main.go
View File

@@ -5,6 +5,7 @@ import (
"net" "net"
"os" "os"
"os/signal" "os/signal"
"runtime/debug"
"syscall" "syscall"
"time" "time"
@@ -29,13 +30,24 @@ func cleanDB(db *sqlx.DB) {
_ = db.MustExec("DELETE FROM users") _ = db.MustExec("DELETE FROM users")
} }
var Commit = func() string {
if info, ok := debug.ReadBuildInfo(); ok {
for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
return setting.Value[:7]
}
}
}
return "unknown"
}
func main() { func main() {
var err error var err error
zapLogger, _ := zap.NewDevelopment() zapLogger, _ := zap.NewDevelopment()
defer zapLogger.Sync() defer zapLogger.Sync()
logger := zapLogger.Named("main") logger := zapLogger.Named("main")
logger.Info("Starting Erupe (9.2b)") logger.Info(fmt.Sprintf("Starting Erupe (9.2b-%s)", Commit()))
if config.ErupeConfig.Database.Password == "" { if config.ErupeConfig.Database.Password == "" {
preventClose("Database password is blank") preventClose("Database password is blank")
@@ -113,6 +125,8 @@ func main() {
logger.Info("Done cleaning DB") logger.Info("Done cleaning DB")
} }
logger.Info(fmt.Sprintf("Server Time: %s", channelserver.TimeAdjusted().String()))
// Now start our server(s). // Now start our server(s).
// Entrance server. // Entrance server.
@@ -211,12 +225,14 @@ func main() {
} }
} }
logger.Info("Finished starting Erupe")
// Wait for exit or interrupt with ctrl+C. // Wait for exit or interrupt with ctrl+C.
c := make(chan os.Signal, 1) c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt, syscall.SIGTERM) signal.Notify(c, os.Interrupt, syscall.SIGTERM)
<-c <-c
logger.Info("Trying to shutdown gracefully") logger.Info("Shutting down...")
if config.ErupeConfig.Channel.Enabled { if config.ErupeConfig.Channel.Enabled {
for _, c := range channels { for _, c := range channels {