acoolname/gitlab.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix broken shutdown handler

Browse Source 
This is a #PATCH release.
This commit is contained in:
Harrison (Harry) Cramer
2024-09-14 18:34:05 -04:00
committed by GitHub
parent 22bfd0c83e
commit dba15127fe
3 changed files with 21 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/app/server.go
View File

@@ -18,7 +18,7 @@ to handle potential shutdown requests and incoming HTTP requests.
*/
func StartServer(client *Client, projectInfo *ProjectInfo, GitInfo git.GitData) {
s := shutdown{
s := shutdownService{
sigCh: make(chan os.Signal, 1),
}
@@ -26,7 +26,7 @@ func StartServer(client *Client, projectInfo *ProjectInfo, GitInfo git.GitData)
r := CreateRouter(
client,
projectInfo,
s,
&s,
func(a *data) error { a.projectInfo = projectInfo; return nil },
func(a *data) error { a.gitInfo = &GitInfo; return nil },
func(a *data) error { err := attachEmojis(a, fr); return err },
@@ -39,10 +39,8 @@ func StartServer(client *Client, projectInfo *ProjectInfo, GitInfo git.GitData)
go func() {
err := server.Serve(l)
if err != nil {
if errors.Is(err, http.ErrServerClosed) {
os.Exit(0)
} else {
fmt.Fprintf(os.Stderr, "Server did not respond: %s\n", err)
if !errors.Is(err, http.ErrServerClosed) {
fmt.Fprintf(os.Stderr, "Server crashed: %s\n", err)
os.Exit(1)
}
}
@@ -76,7 +74,7 @@ type data struct {
type optFunc func(a *data) error
func CreateRouter(gitlabClient *Client, projectInfo *ProjectInfo, s ShutdownHandler, optFuncs ...optFunc) http.Handler {
func CreateRouter(gitlabClient *Client, projectInfo *ProjectInfo, s *shutdownService, optFuncs ...optFunc) http.Handler {
m := http.NewServeMux()
d := data{
@@ -188,7 +186,6 @@ func CreateRouter(gitlabClient *Client, projectInfo *ProjectInfo, s ShutdownHand
withPayloadValidation(methodToPayload{http.MethodPost: &DraftNotePublishRequest{}}),
withMethodCheck(http.MethodPost),
))
m.HandleFunc("/pipeline", middleware(
pipelineService{d, gitlabClient, git.Git{}},
withMethodCheck(http.MethodGet),
@@ -230,8 +227,12 @@ func CreateRouter(gitlabClient *Client, projectInfo *ProjectInfo, s ShutdownHand
withPayloadValidation(methodToPayload{http.MethodPost: &MergeRequestByUsernameRequest{}}),
withMethodCheck(http.MethodPost),
))
m.HandleFunc("/shutdown", middleware(
*s,
withPayloadValidation(methodToPayload{http.MethodPost: &ShutdownRequest{}}),
withMethodCheck(http.MethodPost),
))
m.HandleFunc("/shutdown", s.shutdownHandler)
m.Handle("/ping", http.HandlerFunc(pingHandler))
return LoggingServer{handler: m}