add shutdown

src/main/main.go

@@ -14,11 +14,11 @@ import (
 )
 
 type args struct {
-	Port string `arg:"-p" help:"web server port"`
+	Port     string `arg:"-p" help:"web server port"`
-	Path string `arg:"-d" help:"database path"`
+	Path     string `arg:"-d" help:"database path"`
-	Add  string `arg:"-a" help:"add torrent link and exit"`
+	Add      string `arg:"-a" help:"add torrent link and exit"`
-	RDB  bool   `arg:"-r" help:"start in read-only DB mode"`
+	RDB      bool   `arg:"-r" help:"start in read-only DB mode"`
-	Kill bool   `arg:"-k" help:"dont kill program on signal"`
+	DontKill bool   `arg:"-k" help:"dont kill program on signal"`
 }
 
 func (args) Version() string {
@@ -42,7 +42,7 @@ func main() {
 		add()
 	}
 
-	Preconfig(params.Kill)
+	Preconfig(params.DontKill)
 
 	server.Start(params.Path, params.Port, params.RDB)
 	fmt.Println(server.WaitServer())

src/main/preconfig_pos.go

@@ -3,47 +3,47 @@
 package main
 
 import (
-	"context"
 	"fmt"
-	"net"
 	"os"
 	"os/signal"
 	"syscall"
 )
 
-func Preconfig(kill bool) {
+func Preconfig(dkill bool) {
-	sigc := make(chan os.Signal, 1)
+	if dkill {
-	signal.Notify(sigc,
+		sigc := make(chan os.Signal, 1)
-		syscall.SIGHUP,
+		signal.Notify(sigc,
-		syscall.SIGINT,
+			syscall.SIGHUP,
-		syscall.SIGSTOP,
+			syscall.SIGINT,
-		syscall.SIGPIPE,
+			syscall.SIGSTOP,
-		syscall.SIGTERM,
+			syscall.SIGPIPE,
-		syscall.SIGQUIT)
+			syscall.SIGTERM,
-	go func() {
+			syscall.SIGQUIT)
-		for s := range sigc {
+		go func() {
-			if kill {
+			for s := range sigc {
-				fmt.Println("Signal catched:", s)
+				if dkill {
-				fmt.Println("For stop server, close in web")
+					fmt.Println("Signal catched:", s)
+					fmt.Println("For stop server, close in api")
+				}
 			}
-		}
+		}()
-	}()
-
-	//dns resover
-	addrs, err := net.LookupHost("www.themoviedb.org")
-	if len(addrs) == 0 {
-		fmt.Println("Check dns", addrs, err)
-
-		fn := func(ctx context.Context, network, address string) (net.Conn, error) {
-			d := net.Dialer{}
-			return d.DialContext(ctx, "udp", "1.1.1.1:53")
-		}
-
-		net.DefaultResolver = &net.Resolver{
-			Dial: fn,
-		}
-
-		addrs, err = net.LookupHost("www.themoviedb.org")
-		fmt.Println("Check new dns", addrs, err)
 	}
+	//
+	// //dns resover
+	// addrs, err := net.LookupHost("www.themoviedb.org")
+	// if len(addrs) == 0 {
+	// 	fmt.Println("Check dns", addrs, err)
+	//
+	// 	fn := func(ctx context.Context, network, address string) (net.Conn, error) {
+	// 		d := net.Dialer{}
+	// 		return d.DialContext(ctx, "udp", "1.1.1.1:53")
+	// 	}
+	//
+	// 	net.DefaultResolver = &net.Resolver{
+	// 		Dial: fn,
+	// 	}
+	//
+	// 	addrs, err = net.LookupHost("www.themoviedb.org")
+	// 	fmt.Println("Check new dns", addrs, err)
+	// }
 }

src/server/settings/settings.go

@@ -14,3 +14,10 @@ func InitSets(path string, readOnly bool) {
 func CloseDB() {
 	tdb.CloseDB()
 }
+
+func IsReadOnly() bool {
+	if tdb == nil || tdb.ReadOnly {
+		return true
+	}
+	return false
+}

src/server/torr/apihelper.go

@@ -1,6 +1,7 @@
 package torr
 
 import (
+	"os"
 	"sort"
 
 	"server/log"
@@ -104,3 +105,9 @@ func SetSettings(set *sets.BTSets) {
 	sets.SetBTSets(set)
 	bts.Connect()
 }
+
+func Shutdown() {
+	bts.Disconnect()
+	sets.CloseDB()
+	os.Exit(0)
+}

src/server/web/api/route.go

@@ -1,7 +1,12 @@
 package api
 
 import (
+	"net/http"
+	"time"
+
 	"github.com/gin-gonic/gin"
+	sets "server/settings"
+	"server/torr"
 	"server/version"
 )
 
@@ -11,6 +16,7 @@ type requestI struct {
 
 func SetupRoute(route *gin.Engine) {
 	route.GET("/echo", echo)
+	route.GET("/shutdown", shutdown)
 
 	route.POST("/settings", settings)
 
@@ -29,3 +35,15 @@ func SetupRoute(route *gin.Engine) {
 func echo(c *gin.Context) {
 	c.String(200, "%v", version.Version)
 }
+
+func shutdown(c *gin.Context) {
+	if sets.IsReadOnly() {
+		c.Status(http.StatusForbidden)
+		return
+	}
+	c.Status(200)
+	go func() {
+		time.Sleep(1000)
+		torr.Shutdown()
+	}()
+}