feat: add int signal and fix logging

ItsNotGoodName · Jan 3, 2022 · f97458b · f97458b
1 parent 21dd94e
commit f97458b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/cmd/server.go b/cmd/server.go
@@ -22,6 +22,10 @@ THE SOFTWARE.
 package cmd
 
 import (
+	"log"
+	"os"
+	"os/signal"
+
 	"github.com/ItsNotGoodName/smtpbridge/app"
 	"github.com/ItsNotGoodName/smtpbridge/config"
 	"github.com/ItsNotGoodName/smtpbridge/core"
@@ -86,7 +90,20 @@ var serverCmd = &cobra.Command{
 		// Init and start smtp server
 		smtpBackend := smtp.NewBackend(app)
 		smtpServer := smtp.New(serverConfig, smtpBackend)
-		smtpServer.Start()
+		go smtpServer.Start()
+
+		// Wait for interrupt
+		stop := make(chan os.Signal, 1)
+		signal.Notify(stop, os.Interrupt)
+		<-stop
+
+		// Close database
+		err := db.Close()
+		if err != nil {
+			log.Println("error closing database:", err)
+		}
+
+		log.Println("server stopped")
 	},
 }
 

diff --git a/config/config.go b/config/config.go
@@ -94,7 +94,7 @@ func New() *Config {
 func (c *Config) Load() {
 	if err := viper.ReadInConfig(); err != nil {
 		if _, ok := err.(viper.ConfigParseError); ok {
-			log.Fatalln("config.Load:", err)
+			log.Fatalln("config.Config.Load:", err)
 		}
 	}
 

diff --git a/right/repository/database.go b/right/repository/database.go
@@ -17,7 +17,7 @@ type Database struct {
 func NewDatabase(cfg *config.Config) Database {
 	db, err := storm.Open(cfg.DB.DB)
 	if err != nil {
-		log.Fatalln("repository.NewStorm: could not open database:", err)
+		log.Fatalln("repository.NewDatabase: could not open database:", err)
 	}
 
 	attachment := NewAttachment(cfg, db)