Wire all the things together

configuration/config.go

@@ -18,7 +18,7 @@ func Load(in []byte) error {
 	c := Configuration{}
 	err := yaml.Unmarshal(in, &c)
 	if err != nil {
-		return fmt.Errorf("failed to parse configuration: %s", err)
+		return fmt.Errorf("failed to parse: %s", err)
 	}
 
 	config = c

main.go

@@ -2,8 +2,12 @@ package main
 
 import (
 	"flag"
+	"io/ioutil"
 	"os"
+	"os/signal"
+	"syscall"
 
+	"gitlab.com/yakshaving.art/propaganda/configuration"
 	"gitlab.com/yakshaving.art/propaganda/core"
 	"gitlab.com/yakshaving.art/propaganda/github"
 	"gitlab.com/yakshaving.art/propaganda/gitlab"
@@ -31,15 +35,46 @@ func main() {
 			gitlab.NewParser(args.MatchString),
 		})
 
-	logrus.Fatal(s.ListenAndServe(args.Address))
+	go func() {
+		logrus.Fatal(s.ListenAndServe(args.Address))
+	}()
+
+	signalCh := make(chan os.Signal, 1)
+	signal.Notify(signalCh, syscall.SIGHUP, syscall.SIGINT, syscall.SIGUSR1, syscall.SIGUSR2)
+
+	for sig := range signalCh {
+		switch sig {
+		case syscall.SIGHUP:
+			logrus.Info("Reloading the configuration")
+			loadConfiguration(args)
+
+		case syscall.SIGUSR1:
+			toggleLogLevel()
+
+		case syscall.SIGINT:
+			logrus.Info("Shutting down gracefully")
+			s.Shutdown()
+			os.Exit(0)
+		}
+	}
 }
 
 func setupLogger() {
 	logrus.AddHook(filename.NewHook())
 	logrus.SetFormatter(&logrus.TextFormatter{
 		FullTimestamp: true,
 	})
-	logrus.SetLevel(logrus.DebugLevel)
+}
+
+func toggleLogLevel() {
+	switch logrus.GetLevel() {
+	case logrus.DebugLevel:
+		logrus.Infof("setting info log level")
+		logrus.SetLevel(logrus.InfoLevel)
+	default:
+		logrus.Infof("settings debug log level")
+		logrus.SetLevel(logrus.DebugLevel)
+	}
 }
 
 // Args represents the commandline arguments
@@ -51,6 +86,7 @@ type Args struct {
 	MatchString string
 
 	ConfigFile string
+	Debug      bool
 }
 
 func parseArgs() Args {
@@ -61,15 +97,29 @@ func parseArgs() Args {
 	flag.StringVar(&args.WebhookURL, "webhook-url", os.Getenv("SLACK_WEBHOOK_URL"), "slack webhook url")
 	flag.StringVar(&args.MatchString, "match-pattern", "\\[announce\\]", "match string")
 	flag.StringVar(&args.ConfigFile, "config", "propaganda.yml", "configuration file to use")
+	flag.BoolVar(&args.Debug, "debug", false, "enable debug logging")
 	flag.Parse()
 
+	if args.Debug {
+		toggleLogLevel()
+	}
+
 	if args.WebhookURL == "" {
 		logrus.Fatalf("no slack webhook url, define it through -webhook-url argument or SLACK_WEBHOOK_URL env var")
 	}
 
-	if _, err := os.Stat(args.ConfigFile); err != nil {
-		logrus.Fatalf("failed to stat configuration file %s: %s", args.ConfigFile, err)
-	}
+	loadConfiguration(args)
 
 	return args
 }
+
+func loadConfiguration(args Args) {
+	content, err := ioutil.ReadFile(args.ConfigFile)
+	if err != nil {
+		logrus.Errorf("failed to read configuration file %s: %s", args.ConfigFile, err)
+	}
+
+	if err = configuration.Load(content); err != nil {
+		logrus.Errorf("failed to load configuration file %s: %s", args.ConfigFile, err)
+	}
+}

server/server.go

@@ -12,8 +12,8 @@ import (
 )
 
 // New returns a new Server with the provided parsers
-func New(announcer core.Announcer, parsers []core.Parser) Server {
-	return Server{
+func New(announcer core.Announcer, parsers []core.Parser) *Server {
+	return &Server{
 		parsers:   parsers,
 		announcer: announcer,
 	}
@@ -23,15 +23,23 @@ func New(announcer core.Announcer, parsers []core.Parser) Server {
 type Server struct {
 	parsers   []core.Parser
 	announcer core.Announcer
+	server    *http.Server
 }
 
 // ListenAndServe starts listening and serving traffic
-func (s Server) ListenAndServe(addr string) error {
+func (s *Server) ListenAndServe(addr string) error {
 	http.HandleFunc("/", s.handle)
 
 	metrics.Up.Set(1)
 	logrus.Infof("listening on %s", addr)
-	return http.ListenAndServe(addr, nil)
+
+	s.server = &http.Server{Addr: addr}
+	return s.server.ListenAndServe()
+}
+
+// Shutdown closes the server so it stops listening
+func (s *Server) Shutdown() error {
+	return s.server.Close()
 }
 
 func (s Server) handle(w http.ResponseWriter, r *http.Request) {