1f349/violet
1
0
Fork 0
mirror of https://github.com/1f349/violet.git synced 2024-09-19 10:26:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace exit and reload logic with my new library

Browse Source
This commit is contained in:
Melon 2023-07-24 15:52:47 +01:00
parent 1ca5a6205b
commit b84df84d51
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/violet/serve.go
View File

@ -5,7 +5,6 @@ import (
"database/sql" "database/sql"
"encoding/json" "encoding/json"
"flag" "flag"
"fmt"
"github.com/1f349/violet/certs" "github.com/1f349/violet/certs"
"github.com/1f349/violet/domains" "github.com/1f349/violet/domains"
errorPages "github.com/1f349/violet/error-pages" errorPages "github.com/1f349/violet/error-pages"
@ -16,16 +15,14 @@ import (
"github.com/1f349/violet/servers/api" "github.com/1f349/violet/servers/api"
"github.com/1f349/violet/servers/conf" "github.com/1f349/violet/servers/conf"
"github.com/1f349/violet/utils" "github.com/1f349/violet/utils"
"github.com/MrMelon54/exit-reload"
"github.com/MrMelon54/mjwt" "github.com/MrMelon54/mjwt"
"github.com/google/subcommands" "github.com/google/subcommands"
"io/fs" "io/fs"
"log" "log"
"net/http" "net/http"
"os" "os"
"os/signal"
"path/filepath" "path/filepath"
"syscall"
"time"
) )
type serveCmd struct{ configPath string } type serveCmd struct{ configPath string }
@ -157,27 +154,18 @@ func normalLoad(startUp startUpConfig, wd string) {
go utils.RunBackgroundHttps("HTTPS", srvHttps) go utils.RunBackgroundHttps("HTTPS", srvHttps)
} }
// Wait for exit signal exit_reload.ExitReload("Violet", func() {
sc := make(chan os.Signal, 1) allCompilables.Compile()
signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) }, func() {
<-sc // close http servers
fmt.Println() if srvApi != nil {
srvApi.Close()
// Stop servers }
log.Printf("[Violet] Stopping...") if srvHttp != nil {
n := time.Now() srvHttp.Close()
}
// close http servers if srvHttps != nil {
if srvApi != nil { srvHttps.Close()
srvApi.Close() }
} })
if srvHttp != nil {
srvHttp.Close()
}
if srvHttps != nil {
srvHttps.Close()
}
log.Printf("[Violet] Took '%s' to shutdown\n", time.Now().Sub(n))
log.Println("[Violet] Goodbye")
} }

1
go.mod
View File

@ -5,6 +5,7 @@ go 1.20
require ( require (
github.com/AlecAivazis/survey/v2 v2.3.7 github.com/AlecAivazis/survey/v2 v2.3.7
github.com/MrMelon54/certgen v0.0.1 github.com/MrMelon54/certgen v0.0.1
github.com/MrMelon54/exit-reload v0.0.1
github.com/MrMelon54/mjwt v0.1.1 github.com/MrMelon54/mjwt v0.1.1
github.com/MrMelon54/png2ico v1.0.1 github.com/MrMelon54/png2ico v1.0.1
github.com/MrMelon54/rescheduler v0.0.1 github.com/MrMelon54/rescheduler v0.0.1

2
go.sum
View File

@ -2,6 +2,8 @@ github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkk
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
github.com/MrMelon54/certgen v0.0.1 h1:ycWdZ2RlxQ5qSuejeBVv4aXjGo5hdqqL4j4EjrXnFMk= github.com/MrMelon54/certgen v0.0.1 h1:ycWdZ2RlxQ5qSuejeBVv4aXjGo5hdqqL4j4EjrXnFMk=
github.com/MrMelon54/certgen v0.0.1/go.mod h1:GHflVlSbtFLJZLpN1oWyUvDBRrR8qCWiwZLXCCnS2Gc= github.com/MrMelon54/certgen v0.0.1/go.mod h1:GHflVlSbtFLJZLpN1oWyUvDBRrR8qCWiwZLXCCnS2Gc=
github.com/MrMelon54/exit-reload v0.0.1 h1:sxHa59tNEQMcikwuX2+93lw6Vi1+R7oCRF8a0C3alXc=
github.com/MrMelon54/exit-reload v0.0.1/go.mod h1:PLiSfmUzwdpTTQP3BBfUPhkqPwaIZjx0DuXBnM76Bug=
github.com/MrMelon54/mjwt v0.1.1 h1:m+aTpxbhQCrOPKHN170DQMFR5r938LkviU38unob5Jw= github.com/MrMelon54/mjwt v0.1.1 h1:m+aTpxbhQCrOPKHN170DQMFR5r938LkviU38unob5Jw=
github.com/MrMelon54/mjwt v0.1.1/go.mod h1:oYrDBWK09Hju98xb+bRQ0wy+RuAzacxYvKYOZchR2Tk= github.com/MrMelon54/mjwt v0.1.1/go.mod h1:oYrDBWK09Hju98xb+bRQ0wy+RuAzacxYvKYOZchR2Tk=
github.com/MrMelon54/png2ico v1.0.1 h1:zJoSSl4OkvSIMWGyGPvb8fWNa0KrUvMIjgNGLNLJhVQ= github.com/MrMelon54/png2ico v1.0.1 h1:zJoSSl4OkvSIMWGyGPvb8fWNa0KrUvMIjgNGLNLJhVQ=