Merge pull request #269 from simonmittag/268

268

cmd/j8a/main.go

@@ -3,10 +3,21 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 	"github.com/simonmittag/j8a"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
 )
 
 func main() {
+	go waitForSignal()
+
+	//for Bootstrap
+	defer recovery()
+
 	cfgFile := flag.String("c", j8a.DefaultConfigFile, "config file location")
 	flag.Usage = func() {
 		fmt.Printf(`j8a[%s] "Achuta! j8a [ dʒʌbbʌ ] is a TLS reverse proxy server for JSON APIs written in golang."`, j8a.Version)
@@ -31,3 +42,32 @@ func isFlagPassed(name string) bool {
 	})
 	return found
 }
+
+func recovery() {
+	if r := recover(); r != nil {
+		pid := os.Getpid()
+		log.WithLevel(zerolog.FatalLevel).
+			Int("pid", pid).
+			Msg("exiting...")
+		os.Exit(-1)
+	}
+}
+
+func waitForSignal() {
+	defer recovery()
+	sig := interruptChannel()
+	for {
+		select {
+		case <-sig:
+			panic("os signal")
+		default:
+			time.Sleep(time.Second * 1)
+		}
+	}
+}
+
+func interruptChannel() chan os.Signal {
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL, syscall.SIGQUIT)
+	return sigs
+}

config.go

@@ -67,7 +67,6 @@ func (config Config) panic(msg string) {
 	if len(msg) == 0 {
 		msg = "error loading config."
 	}
-	msg = msg + " exiting..."
 	log.WithLevel(zerolog.FatalLevel).Msg(msg)
 	panic(msg)
 }
@@ -86,7 +85,7 @@ func (config Config) readYmlFile(file string) *Config {
 	f, err := os.Open(file)
 	defer f.Close()
 	if err != nil {
-		msg := fmt.Sprintf("unable to load config from %s, exiting...", file)
+		msg := fmt.Sprintf("unable to load config from %s", file)
 		log.Fatal().Msg(msg)
 		panic(msg)
 	}
@@ -224,15 +223,15 @@ func (config Config) validateAcmeConfig() *Config {
 		if !acmeProvider {
 			config.panic("ACME provider must be specified in ACME config")
 		}
-	
+
 		if !acmeDomain {
 			config.panic("ACME domain must be specified in ACME config")
 		}
 
 		if !acmeEmail {
 			config.panic("ACME email must be specified in ACME config")
 		}
-	
+
 		// ACME domain checks
 		for _, domain := range config.Connection.Downstream.Tls.Acme.Domains {
 			if !govalidator.IsDNSName(domain) {
@@ -255,7 +254,7 @@ func (config Config) validateAcmeConfig() *Config {
 				config.panic(fmt.Sprintf("ACME domain validation does not support domains ending with '.', was %s", domain))
 			}
 		}
-	
+
 		// ACME provider checks
 		if _, supported := acmeProviders[config.Connection.Downstream.Tls.Acme.Provider]; !supported {
 			config.panic(fmt.Sprintf("ACME provider not supported: %s", config.Connection.Downstream.Tls.Acme.Provider))

logger.go

@@ -49,6 +49,14 @@ func initServerID() {
 	log.Logger = log.With().Str("srvId", ID).Logger()
 }
 
+//ServerID is a unique identifier made up as md5 of hostname and version.
+//initServerId creates a unique ID for the server log.
+func initPID() {
+	pid := os.Getpid()
+	log.Info().Int("pid", pid).Msg("pid determined")
+	log.Logger = log.With().Int("pid", pid).Logger()
+}
+
 func getHost() string {
 	host := os.Getenv("HOSTNAME")
 	if len(host) == 0 {
@@ -93,5 +101,6 @@ func initLogger() {
 
 	initServerID()
 	initTime()
+	initPID()
 	log.Info().Msgf("setting global log level to %s", logLevel)
 }

server.go

@@ -278,7 +278,7 @@ func (rt *Runtime) startListening() {
 
 	select {
 	case sig := <-err:
-		log.Fatal().Err(sig).Msg("... j8a exiting")
+		log.Fatal().Err(sig).Msg(sig.Error())
 		panic(sig.Error())
 	}
 }