From d7973591f8d3aa82e6ee72c4f8483f295b32b1bd Mon Sep 17 00:00:00 2001
From: JK <j.kuettner@mittwald.de>
Date: Mon, 20 Jul 2020 15:38:32 +0200
Subject: [PATCH] Make it possible to listen on unix sockets (#21)

* Make it possible to listen to unix sockets

+ rename listeners protocol to forwardProtocol
+ add listenProtocol option

* Move protocol finder to a separate function
---
 internal/config/types.go |  9 +++++---
 pkg/proc/job_listener.go | 47 +++++++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/internal/config/types.go b/internal/config/types.go
index 72d742c..b18c563 100644
--- a/internal/config/types.go
+++ b/internal/config/types.go
@@ -63,9 +63,12 @@ type Watch struct {
 }
 
 type Listener struct {
-	Address  string `hcl:",key"`
-	Forward  string `hcl:"forward"`
-	Protocol string `hcl:"protocol"`
+	Address         string `hcl:",key"`
+	ListenProtocol  string `hcl:"listenProtocol"`
+	Forward         string `hcl:"forward"`
+	ForwardProtocol string `hcl:"forwardProtocol"`
+
+	Protocol string `hcl:"protocol"` // deprecated
 }
 
 type Laziness struct {
diff --git a/pkg/proc/job_listener.go b/pkg/proc/job_listener.go
index 7d0b260..3e38871 100644
--- a/pkg/proc/job_listener.go
+++ b/pkg/proc/job_listener.go
@@ -4,34 +4,45 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/mittwald/mittnite/internal/config"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"net"
 	"sync/atomic"
 	"time"
+
+	"github.com/mittwald/mittnite/internal/config"
+	log "github.com/sirupsen/logrus"
 )
 
 type Listener struct {
-	config            *config.Listener
-	job               *Job
-	socket            net.Listener
-	spinUpTimeout     time.Duration
+	config        *config.Listener
+	job           *Job
+	socket        net.Listener
+	spinUpTimeout time.Duration
 }
 
 func NewListener(j *Job, c *config.Listener) (*Listener, error) {
 	log.WithField("address", c.Address).Info("starting TCP listener")
 
-	listener, err := net.Listen("tcp", c.Address)
+	// deprecation check
+	if c.Protocol != "" {
+		if c.ForwardProtocol == "" {
+			log.Warnf("field protocol in job %s is deprecated in favor of forwardProtocol", j.Config.Name)
+			c.ForwardProtocol = c.Protocol
+		} else {
+			log.Warnf("field protocol in job %s is ignored because it is deprecated and forwardProtocol is already set", j.Config.Name)
+		}
+	}
+
+	listener, err := net.Listen(getProto(c.ListenProtocol), c.Address)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Listener{
-		config:          c,
-		job:             j,
-		socket:          listener,
-		spinUpTimeout:   j.spinUpTimeout,
+		config:        c,
+		job:           j,
+		socket:        listener,
+		spinUpTimeout: j.spinUpTimeout,
 	}, nil
 }
 
@@ -47,11 +58,6 @@ func (l *Listener) Run(ctx context.Context) error {
 }
 
 func (l *Listener) provideUpstreamConnection() (net.Conn, error) {
-	prot := l.config.Protocol
-	if prot == "" {
-		prot = "tcp"
-	}
-
 	timeout := time.NewTimer(l.spinUpTimeout)
 	ticker := time.NewTicker(20 * time.Millisecond)
 
@@ -61,7 +67,7 @@ func (l *Listener) provideUpstreamConnection() (net.Conn, error) {
 	for {
 		select {
 		case <-ticker.C:
-			conn, err := net.Dial(prot, l.config.Forward)
+			conn, err := net.Dial(getProto(l.config.ForwardProtocol), l.config.Forward)
 			if err == nil {
 				return conn, nil
 			}
@@ -137,3 +143,10 @@ func (l *Listener) run(ctx context.Context) <-chan error {
 
 	return errChan
 }
+
+func getProto(proto string) string {
+	if proto == "" {
+		proto = "tcp"
+	}
+	return proto
+}