tidying up here and there

This commit is contained in:
tsmethurst 2021-03-04 14:38:18 +01:00
commit 052783db66
16 changed files with 366 additions and 215 deletions

View file

@ -17,50 +17,3 @@
*/
package server
import (
"context"
"fmt"
"os"
"os/signal"
"syscall"
"github.com/gotosocial/gotosocial/internal/config"
"github.com/gotosocial/gotosocial/internal/consts"
"github.com/gotosocial/gotosocial/internal/db"
"github.com/gotosocial/gotosocial/internal/log"
"github.com/urfave/cli/v2"
)
// Run starts the gotosocial server
func Run(c *cli.Context) error {
log, err := log.New(c.String("log-level"))
if err != nil {
return fmt.Errorf("error creating logger: %s", err)
}
gtsConfig, err := config.New(c.String(consts.GetFlagNames().ConfigPath))
if err != nil {
return fmt.Errorf("error creating config: %s", err)
}
ctx := context.Background()
dbService, err := db.NewService(ctx, gtsConfig.DBConfig, log)
if err != nil {
return fmt.Errorf("error creating dbservice: %s", err)
}
// catch shutdown signals from the operating system
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, os.Interrupt, syscall.SIGTERM)
sig := <-sigs
log.Infof("received signal %s, shutting down", sig)
// close down all running services in order
if err := dbService.Stop(ctx); err != nil {
return fmt.Errorf("error closing dbservice: %s", err)
}
log.Info("done! exiting...")
return nil
}