3pp-mirror/pushbits
1
0
Fork 0
mirror of https://github.com/pushbits/server.git synced 2025-07-29 22:37:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use logrus for logging

Browse source
This commit is contained in:
eikendev 2022-04-11 23:46:02 +02:00
parent c96baf40a5
commit f839f248b9
No known key found for this signature in database
GPG key ID: A1BDB1B28C8EF694
19 changed files with 192 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cmd/pushbits/main.go
View file

@ -1,7 +1,6 @@
package main
import (
"log"
"os"
"os/signal"
"syscall"
@ -10,6 +9,7 @@ import (
"github.com/pushbits/server/internal/configuration"
"github.com/pushbits/server/internal/database"
"github.com/pushbits/server/internal/dispatcher"
"github.com/pushbits/server/internal/log"
"github.com/pushbits/server/internal/router"
"github.com/pushbits/server/internal/runner"
)
@ -32,45 +32,46 @@ func setupCleanup(db *database.Database, dp *dispatcher.Dispatcher) {
// @version 0.7.2
// @description Documentation for the PushBits server API.
// @contact.name PushBits
// @contact.name The PushBits Developers
// @contact.url https://www.pushbits.io
// @license.name ISC
// @license.url https://github.com/pushbits/server/blob/master/LICENSE
// @host your-domain.net
// @BasePath /
// @query.collection.format multi
// @schemes http https
// @securityDefinitions.basic BasicAuth
func main() {
if len(version) == 0 {
log.Panic("Version not set")
log.L.Panic("Version not set")
} else {
log.Printf("Starting PushBits %s", version)
log.L.Printf("Starting PushBits %s", version)
}
c := configuration.Get()
if c.Debug {
log.Printf("%+v", c)
log.SetDebug()
log.L.Printf("%+v", c)
}
cm := credentials.CreateManager(c.Security.CheckHIBP, c.Crypto)
db, err := database.Create(cm, c.Database.Dialect, c.Database.Connection)
if err != nil {
log.Fatal(err)
log.L.Fatal(err)
}
defer db.Close()
if err := db.Populate(c.Admin.Name, c.Admin.Password, c.Admin.MatrixID); err != nil {
log.Fatal(err)
log.L.Fatal(err)
}
dp, err := dispatcher.Create(c.Matrix.Homeserver, c.Matrix.Username, c.Matrix.Password, c.Formatting)
if err != nil {
log.Fatal(err)
log.L.Fatal(err)
}
defer dp.Close()
@ -78,13 +79,13 @@ func main() {
err = db.RepairChannels(dp)
if err != nil {
log.Fatal(err)
log.L.Fatal(err)
}
engine := router.Create(c.Debug, cm, db, dp)
err = runner.Run(engine, c.HTTP.ListenAddress, c.HTTP.Port)
if err != nil {
log.Fatal(err)
log.L.Fatal(err)
}
}