Merge pull request #18 from hvuhsg/development

Move to internal and make multimux work concurantlry
hvuhsg · Oct 25, 2024 · 93f909d · 93f909d
2 parents e4684e2 + 28ca575
commit 93f909d
Show file tree

Hide file tree

Showing 41 changed files with 33 additions and 34 deletions.
diff --git a/checks.go b/checks.go
@@ -1,7 +1,7 @@
 package gatego
 
 import (
-	"github.com/hvuhsg/gatego/config"
+	"github.com/hvuhsg/gatego/internal/config"
 	"github.com/hvuhsg/gatego/pkg/monitor"
 )
 

diff --git a/cmd/main.go b/cmd/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 
 	"github.com/hvuhsg/gatego"
-	"github.com/hvuhsg/gatego/config"
+	"github.com/hvuhsg/gatego/internal/config"
 )
 
 const version = "0.0.1"

diff --git a/cmd/client/main.go → dev/client/main.go b/cmd/client/main.go → dev/client/main.go
diff --git a/cmd/server/main.go → dev/server/main.go b/cmd/server/main.go → dev/server/main.go
diff --git a/gatego.go b/gatego.go
@@ -2,10 +2,11 @@ package gatego
 
 import (
 	"context"
+	"fmt"
 	"time"
 
-	"github.com/hvuhsg/gatego/config"
-	"github.com/hvuhsg/gatego/contextvalues"
+	"github.com/hvuhsg/gatego/internal/config"
+	"github.com/hvuhsg/gatego/internal/contextvalues"
 	"github.com/hvuhsg/gatego/pkg/monitor"
 )
 
@@ -61,6 +62,7 @@ func (gg GateGo) Run() error {
 	case err = <-serveErrChan:
 		return err
 	case <-gg.ctx.Done():
+		fmt.Println("\nShutting down...")
 		return server.Shutdown(context.Background())
 	}
 }
diff --git a/handler.go b/handler.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"slices"
 
-	"github.com/hvuhsg/gatego/config"
-	"github.com/hvuhsg/gatego/handlers"
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/config"
+	"github.com/hvuhsg/gatego/internal/handlers"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 var ErrUnsupportedBaseHandler = errors.New("base handler unsupported")

diff --git a/config/config.go → internal/config/config.go b/config/config.go → internal/config/config.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-version"
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 	"github.com/hvuhsg/gatego/pkg/cron"
 	"gopkg.in/yaml.v3"
 )

diff --git a/config/config_test.go → internal/config/config_test.go b/config/config_test.go → internal/config/config_test.go
diff --git a/contextvalues/tracer.go → internal/contextvalues/tracer.go b/contextvalues/tracer.go → internal/contextvalues/tracer.go
diff --git a/contextvalues/version.go → internal/contextvalues/version.go b/contextvalues/version.go → internal/contextvalues/version.go
diff --git a/handlers/balancer.go → internal/handlers/balancer.go b/handlers/balancer.go → internal/handlers/balancer.go
@@ -8,8 +8,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/hvuhsg/gatego/config"
-	"github.com/hvuhsg/gatego/contextvalues"
+	"github.com/hvuhsg/gatego/internal/config"
+	"github.com/hvuhsg/gatego/internal/contextvalues"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 )
 

diff --git a/handlers/balancer_test.go → internal/handlers/balancer_test.go b/handlers/balancer_test.go → internal/handlers/balancer_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hvuhsg/gatego/config"
+	"github.com/hvuhsg/gatego/internal/config"
 )
 
 func TestNewBalancer(t *testing.T) {

diff --git a/handlers/files.go → internal/handlers/files.go b/handlers/files.go → internal/handlers/files.go
diff --git a/handlers/files_test.go → internal/handlers/files_test.go b/handlers/files_test.go → internal/handlers/files_test.go
diff --git a/handlers/proxy.go → internal/handlers/proxy.go b/handlers/proxy.go → internal/handlers/proxy.go
@@ -5,8 +5,8 @@ import (
 	"net/http/httputil"
 	"net/url"
 
-	"github.com/hvuhsg/gatego/config"
-	"github.com/hvuhsg/gatego/contextvalues"
+	"github.com/hvuhsg/gatego/internal/config"
+	"github.com/hvuhsg/gatego/internal/contextvalues"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 )
 

diff --git a/middlewares/addheader.go → internal/middlewares/addheader.go b/middlewares/addheader.go → internal/middlewares/addheader.go
diff --git a/middlewares/cache.go → internal/middlewares/cache.go b/middlewares/cache.go → internal/middlewares/cache.go
diff --git a/middlewares/cache_test.go → internal/middlewares/cache_test.go b/middlewares/cache_test.go → internal/middlewares/cache_test.go
diff --git a/middlewares/gzip.go → internal/middlewares/gzip.go b/middlewares/gzip.go → internal/middlewares/gzip.go
diff --git a/middlewares/gzip_test.go → internal/middlewares/gzip_test.go b/middlewares/gzip_test.go → internal/middlewares/gzip_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 // Helper to decode gzip data

diff --git a/middlewares/logging.go → internal/middlewares/logging.go b/middlewares/logging.go → internal/middlewares/logging.go
diff --git a/middlewares/logging_test.go → internal/middlewares/logging_test.go b/middlewares/logging_test.go → internal/middlewares/logging_test.go
diff --git a/middlewares/middleware.go → internal/middlewares/middleware.go b/middlewares/middleware.go → internal/middlewares/middleware.go
diff --git a/middlewares/minify.go → internal/middlewares/minify.go b/middlewares/minify.go → internal/middlewares/minify.go
diff --git a/middlewares/minify_test.go → internal/middlewares/minify_test.go b/middlewares/minify_test.go → internal/middlewares/minify_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 // Helper function to create a basic next handler that returns content with a specific content type

diff --git a/middlewares/omit_headers.go → internal/middlewares/omit_headers.go b/middlewares/omit_headers.go → internal/middlewares/omit_headers.go
diff --git a/middlewares/omit_headers_test.go → internal/middlewares/omit_headers_test.go b/middlewares/omit_headers_test.go → internal/middlewares/omit_headers_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 // TestOmitHeadersMiddleware_OmitResponseHeaders tests that headers are omitted from the response

diff --git a/middlewares/openapi.go → internal/middlewares/openapi.go b/middlewares/openapi.go → internal/middlewares/openapi.go
diff --git a/middlewares/openapi_test.go → internal/middlewares/openapi_test.go b/middlewares/openapi_test.go → internal/middlewares/openapi_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/middlewares/otel.go → internal/middlewares/otel.go b/middlewares/otel.go → internal/middlewares/otel.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/hvuhsg/gatego/contextvalues"
+	"github.com/hvuhsg/gatego/internal/contextvalues"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"

diff --git a/middlewares/ratelimit.go → internal/middlewares/ratelimit.go b/middlewares/ratelimit.go → internal/middlewares/ratelimit.go
diff --git a/middlewares/ratelimit_test.go → internal/middlewares/ratelimit_test.go b/middlewares/ratelimit_test.go → internal/middlewares/ratelimit_test.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 func TestRateLimitExceeded(t *testing.T) {

diff --git a/middlewares/responsecapture.go → internal/middlewares/responsecapture.go b/middlewares/responsecapture.go → internal/middlewares/responsecapture.go
diff --git a/middlewares/sizelimiter.go → internal/middlewares/sizelimiter.go b/middlewares/sizelimiter.go → internal/middlewares/sizelimiter.go
diff --git a/middlewares/sizelimiter_test.go → internal/middlewares/sizelimiter_test.go b/middlewares/sizelimiter_test.go → internal/middlewares/sizelimiter_test.go
@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 // TestRequestSizeLimitMiddleware tests the RequestSizeLimitMiddleware

diff --git a/middlewares/timeout.go → internal/middlewares/timeout.go b/middlewares/timeout.go → internal/middlewares/timeout.go
diff --git a/middlewares/timeout_test.go → internal/middlewares/timeout_test.go b/middlewares/timeout_test.go → internal/middlewares/timeout_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hvuhsg/gatego/middlewares"
+	"github.com/hvuhsg/gatego/internal/middlewares"
 )
 
 func TestTimeoutMiddleware(t *testing.T) {

diff --git a/otel.go b/otel.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/hvuhsg/gatego/contextvalues"
+	"github.com/hvuhsg/gatego/internal/contextvalues"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc"

diff --git a/pkg/multimux/multimux.go b/pkg/multimux/multimux.go
@@ -6,25 +6,21 @@ package multimux
 import (
 	"net/http"
 	"strings"
+	"sync"
 )
 
 type MultiMux struct {
-	Hosts map[string]*http.ServeMux
+	Hosts sync.Map
 }
 
 func NewMultiMux() *MultiMux {
-	hosts := make(map[string]*http.ServeMux)
-	return &MultiMux{Hosts: hosts}
+	return &MultiMux{Hosts: sync.Map{}}
 }
 
 func (mm *MultiMux) RegisterHandler(host string, pattern string, handler http.Handler) {
 	cleanedHost := cleanHost(host)
-	mux, exists := mm.Hosts[cleanedHost]
-
-	if !exists {
-		mux = http.NewServeMux()
-		mm.Hosts[cleanedHost] = mux
-	}
+	muxAny, _ := mm.Hosts.LoadOrStore(cleanedHost, http.NewServeMux())
+	mux := muxAny.(*http.ServeMux)
 
 	cleanedPattern := strings.ToLower(pattern)
 
@@ -34,13 +30,14 @@ func (mm *MultiMux) RegisterHandler(host string, pattern string, handler http.Ha
 func (mm *MultiMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	host := r.Host
 	cleanedHost := cleanHost(host)
-	mux, exists := mm.Hosts[cleanedHost]
+	muxAny, exists := mm.Hosts.Load(cleanedHost)
 
 	if !exists {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
 
+	mux := muxAny.(*http.ServeMux)
 	mux.ServeHTTP(w, r)
 }
 

diff --git a/pkg/multimux/multimux_test.go b/pkg/multimux/multimux_test.go
@@ -27,7 +27,7 @@ func TestRegisterHandler(t *testing.T) {
 			mm.RegisterHandler(tt.host, tt.pattern, handler)
 
 			cleanedHost := cleanHost(tt.host)
-			mux, exists := mm.Hosts[cleanedHost]
+			mux, exists := mm.Hosts.Load(cleanedHost)
 			if !exists {
 				t.Errorf("Host %s was not registered", cleanedHost)
 			}

diff --git a/server.go b/server.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/hvuhsg/gatego/config"
+	"github.com/hvuhsg/gatego/internal/config"
 	"github.com/hvuhsg/gatego/pkg/multimux"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ import ( @@
     	"os"
     	"time"
-    	"github.com/hvuhsg/gatego/config"
+    	"github.com/hvuhsg/gatego/internal/config"
     	"github.com/hvuhsg/gatego/pkg/multimux"
     )
@@ Expand Down @@