1600238645

Committed 23 Dec 2024 10:30AM UTC coverage: 76.615% (+3.8%) from 72.818%

Build # 1600238645

Build Type

Pull #274

gitlab-ci

Committed by

bahaa-ghazal

Commit Message

fix: implement signal handler for `server` commands

Changelog: Title
Ticket: QA-782
Signed-off-by: Bahaa Aldeen Ghazal <bahaa.ghazal@northern.tech>

Pull Request Pull Request #274: fix: implement signal handler for `server` commands

Run Details

4254 of 6166 branches covered (68.99%)

Branch coverage included in aggregate %.

63 of 91 new or added lines in 8 files covered. (69.23%)

46 existing lines in 5 files now uncovered.

45257 of 58457 relevant lines covered (77.42%)

21.82 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/backend/services/reporting/app/server/server.go

// Copyright 2022 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.

package server

import (
        "context"
        "net/http"
        "os"
        "os/signal"
        "time"

        "golang.org/x/sys/unix"

        "github.com/gin-gonic/gin"

        "github.com/mendersoftware/mender-server/pkg/config"
        "github.com/mendersoftware/mender-server/pkg/log"

        api "github.com/mendersoftware/mender-server/services/reporting/api/http"
        "github.com/mendersoftware/mender-server/services/reporting/app/reporting"
        dconfig "github.com/mendersoftware/mender-server/services/reporting/config"
        "github.com/mendersoftware/mender-server/services/reporting/store"
)

func init() {
        if mode := os.Getenv(gin.EnvGinMode); mode != "" {
                gin.SetMode(mode)
        } else {
                gin.SetMode(gin.ReleaseMode)
        }
}

// InitAndRun initializes the server and runs it
func InitAndRun(conf config.Reader, store store.Store, ds store.DataStore) error {
        ctx := context.Background()

        l := log.FromContext(ctx)

        reporting := reporting.NewApp(store, ds)

        var listen = conf.GetString(dconfig.SettingListen)
        var router = api.NewRouter(reporting)
        srv := &http.Server{
                Addr:    listen,
                Handler: router,
        }

        go func() {
                if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
                        l.Fatalf("listen: %s\n", err)
                }
        }()

        quit := make(chan os.Signal, 1)
        signal.Notify(quit, unix.SIGINT, unix.SIGTERM)
        <-quit

        l.Info("Shutdown Server ...")

        ctxWithTimeout, cancel := context.WithTimeout(ctx, 5*time.Second)
        defer cancel()
        if err := srv.Shutdown(ctxWithTimeout); err != nil {
                l.Fatal("Server Shutdown: ", err)
        }

        return nil
}

1	// Copyright 2022 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	package server
16
17	import (
18	"context"
19	"net/http"
20	"os"
21	"os/signal"
22	"time"
23
24	"golang.org/x/sys/unix"
25
26	"github.com/gin-gonic/gin"
27
28	"github.com/mendersoftware/mender-server/pkg/config"
29	"github.com/mendersoftware/mender-server/pkg/log"
30
31	api "github.com/mendersoftware/mender-server/services/reporting/api/http"
32	"github.com/mendersoftware/mender-server/services/reporting/app/reporting"
33	dconfig "github.com/mendersoftware/mender-server/services/reporting/config"
34	"github.com/mendersoftware/mender-server/services/reporting/store"
35	)
36
37	func init() {	×
38	if mode := os.Getenv(gin.EnvGinMode); mode != "" {	×
39	gin.SetMode(mode)	×
40	} else {	×
41	gin.SetMode(gin.ReleaseMode)	×
42	}	×
43	}
44
45	// InitAndRun initializes the server and runs it
46	func InitAndRun(conf config.Reader, store store.Store, ds store.DataStore) error {	×
47	ctx := context.Background()	×
48		×
49	l := log.FromContext(ctx)	×
50		×
51	reporting := reporting.NewApp(store, ds)	×
52		×
53	var listen = conf.GetString(dconfig.SettingListen)	×
54	var router = api.NewRouter(reporting)	×
55	srv := &http.Server{	×
56	Addr: listen,	×
57	Handler: router,	×
58	}	×
59		×
60	go func() {	×
61	if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {	×
62	l.Fatalf("listen: %s\n", err)	×
63	}	×
64	}()
65
66	quit := make(chan os.Signal, 1)	×
67	signal.Notify(quit, unix.SIGINT, unix.SIGTERM)	×
68	<-quit	×
69		×
70	l.Info("Shutdown Server ...")	×
71		×
72	ctxWithTimeout, cancel := context.WithTimeout(ctx, 5*time.Second)	×
73	defer cancel()	×
74	if err := srv.Shutdown(ctxWithTimeout); err != nil {	×
NEW 75	l.Fatal("Server Shutdown: ", err)	×
NEW 76	}	×
77
UNCOV 78	return nil	×
79	}

mendersoftware / mender-server / 1600238645

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous