adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-08 00:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

all logs now have an op field

Browse Source
This commit is contained in:
Julien Neuhart
2019-07-07 19:54:44 +02:00
parent c8f7ea934c
commit 5f6ab2fc08
16 changed files with 240 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/gotenberg/main.go
View File

@@ -9,8 +9,8 @@ import (
"time"
"github.com/thecodingmachine/gotenberg/internal/app/api"
conf "github.com/thecodingmachine/gotenberg/internal/pkg/config"
log "github.com/thecodingmachine/gotenberg/internal/pkg/logger"
"github.com/thecodingmachine/gotenberg/internal/pkg/config"
"github.com/thecodingmachine/gotenberg/internal/pkg/logger"
"github.com/thecodingmachine/gotenberg/internal/pkg/pm2"
)
@@ -19,12 +19,13 @@ import (
var version = "snapshot"
func main() {
config, err := conf.FromEnv()
systemLogger := log.New(config.LogLevel(), "system")
const op = "main"
config, err := config.FromEnv()
systemLogger := logger.New(config.LogLevel(), "system")
if err != nil {
systemLogger.Fatal(err)
systemLogger.FatalOp(op, err)
}
systemLogger.Infof("Gotenberg %s", version)
systemLogger.InfofOp(op, "Gotenberg %s", version)
// start PM2 processes.
var processes []pm2.Process
if config.EnableChromeEndpoints() {
@@ -34,19 +35,19 @@ func main() {
processes = append(processes, pm2.NewUnoconv(systemLogger))
}
for _, p := range processes {
systemLogger.Infof("starting %s with PM2...", p.Fullname())
systemLogger.InfofOp(op, "starting %s with PM2...", p.Fullname())
if err := p.Start(); err != nil {
systemLogger.Fatal(err)
systemLogger.FatalOp(op, err)
}
}
// run our API in a goroutine so that it doesn't block.
// create our API.
srv := api.New(config)
go func() {
systemLogger.Infof("http server started on port %s", config.DefaultListenPort())
systemLogger.InfofOp(op, "http server started on port %s", config.DefaultListenPort())
if err := srv.Start(fmt.Sprintf(":%s", config.DefaultListenPort())); err != nil {
if err != http.ErrServerClosed {
systemLogger.Fatal(err)
systemLogger.FatalOp(op, err)
}
}
}()
@@ -61,17 +62,17 @@ func main() {
defer cancel()
// doesn't block if no connections, but will otherwise wait
// until the timeout deadline.
systemLogger.Info("shutting down http server...")
systemLogger.InfofOp(op, "shutting down http server...")
if err := srv.Shutdown(ctx); err != nil {
systemLogger.Fatal(err)
systemLogger.FatalOp(op, err)
}
// shutdown PM2 processes.
for _, p := range processes {
systemLogger.Infof("shutting down %s with PM2...", p.Fullname())
systemLogger.InfofOp(op, "shutting down %s with PM2...", p.Fullname())
if err := p.Shutdown(); err != nil {
systemLogger.Fatal(err)
systemLogger.FatalOp(op, err)
}
}
systemLogger.Info("bye!")
systemLogger.InfofOp(op, "bye!")
os.Exit(0)
}