Merge branch 'release/0.4.1'

Makefile

@@ -8,7 +8,7 @@ REGISTRY?=docker.io/takama
 CA_DIR?=certs
 
 # Use the 0.0.0 tag for testing, it shouldn't clobber any release builds
-RELEASE?=0.4.0
+RELEASE?=0.4.1
 GOOS?=linux
 GOARCH?=amd64
 

charts/Chart.yaml

@@ -1,6 +1,6 @@
 name: k8sapp
 description: A Helm charts for Kubernetes application
-version: 0.4.0
+version: 0.4.1
 home: https://my.domain/
 sources:
   - https://github.com/takama/k8sapp

charts/values-dev.yaml

@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.4.0
+  tag: 0.4.1
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

charts/values-stable.yaml

@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.4.0
+  tag: 0.4.1
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

cmd/k8sapp.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/service"
+	"github.com/takama/k8sapp/pkg/system"
 )
 
 func main() {
@@ -20,11 +21,17 @@ func main() {
 	}
 
 	// Configure service and get router
-	router, err := service.Setup(cfg)
+	router, logger, err := service.Setup(cfg)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Listen and serve handlers
-	router.Listen(fmt.Sprintf("%s:%d", cfg.LocalHost, cfg.LocalPort))
+	go router.Listen(fmt.Sprintf("%s:%d", cfg.LocalHost, cfg.LocalPort))
+
+	// Wait signals
+	signals := system.NewSignals()
+	if err := signals.Wait(logger, new(system.Handling)); err != nil {
+		logger.Fatal(err)
+	}
 }

docs/CHANGELOG.md

@@ -1,7 +1,13 @@
-# Version 0.4.0
+# Version 0.4.1
 
 [Documentation](README.md)
 
+## Changelog since 0.4.0
+
+### Codebase
+
+- Used system signal handling and info handler ([#33](https://github.com/takama/k8sapp/pull/33), [@takama](https://github.com/takama))
+
 ## Changelog since 0.3.1
 
 ### Documentation

pkg/service/service.go

@@ -5,6 +5,8 @@
 package service
 
 import (
+	"net/http"
+
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/handlers"
 	"github.com/takama/k8sapp/pkg/logger"
@@ -15,9 +17,9 @@ import (
 )
 
 // Setup configures the service
-func Setup(cfg *config.Config) (r router.BitRoute, err error) {
+func Setup(cfg *config.Config) (r router.BitRoute, log logger.Logger, err error) {
 	// Setup logger
-	log := stdlog.New(&logger.Config{
+	log = stdlog.New(&logger.Config{
 		Level: cfg.LogLevel,
 		Time:  true,
 		UTC:   true,
@@ -33,11 +35,21 @@ func Setup(cfg *config.Config) (r router.BitRoute, err error) {
 	// Register new router
 	r = bitroute.New()
 
+	// Response for undefined methods
+	r.SetupNotFoundHandler(h.Base(notFound))
+
 	// Configure router
 	r.SetupMiddleware(h.Base)
 	r.GET("/", h.Root)
 	r.GET("/healthz", h.Health)
 	r.GET("/readyz", h.Ready)
+	r.GET("/info", h.Info)
 
 	return
 }
+
+// Response for undefined methods
+func notFound(c router.Control) {
+	c.Code(http.StatusNotFound)
+	c.Write("Method not found for " + c.Request().URL.Path)
+}

pkg/service/service_test.go

@@ -1,22 +1,46 @@
 package service
 
 import (
+	"net/http"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/takama/k8sapp/pkg/config"
+	"github.com/takama/k8sapp/pkg/handlers"
+	"github.com/takama/k8sapp/pkg/router/bitroute"
 )
 
-func TestRun(t *testing.T) {
+func TestSetup(t *testing.T) {
 	cfg := new(config.Config)
 	err := cfg.Load(config.SERVICENAME)
 	if err != nil {
 		t.Error("Expected loading of environment vars, got", err)
 	}
-	router, err := Setup(cfg)
+	router, logger, err := Setup(cfg)
 	if err != nil {
 		t.Errorf("Fail, got '%s', want '%v'", err, nil)
 	}
 	if router == nil {
 		t.Error("Expected new router, got nil")
 	}
+	if logger == nil {
+		t.Error("Expected new logger, got nil")
+	}
+
+	h := handlers.New(logger, cfg)
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		h.Base(notFound)(bitroute.NewControl(w, r))
+	})
+
+	req, err := http.NewRequest("GET", "/notfound", nil)
+	if err != nil {
+		t.Error(err)
+	}
+
+	trw := httptest.NewRecorder()
+	handler.ServeHTTP(trw, req)
+
+	if trw.Code != http.StatusNotFound {
+		t.Error("Expected status:", http.StatusNotFound, "got", trw.Code)
+	}
 }