Fix nil muxOptions #59

e.g. tests
coupergateway · Nov 9, 2020 · f1cbd2e · f1cbd2e
1 parent c1b066e
commit f1cbd2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/server/http_test.go b/server/http_test.go
@@ -236,7 +236,7 @@ func TestHTTPServer_ServeHTTP_UUID_Option(t *testing.T) {
 			log, hook := logrustest.NewNullLogger()
 			conf := *runtime.DefaultHTTP
 			conf.RequestIDFormat = testcase.formatOption
-			srv := server.New(context.Background(), log, &conf, "0", nil)
+			srv := server.New(context.Background(), log, &conf, "test", "0", nil)
 			srv.Listen()
 			defer srv.Close()
 

diff --git a/server/mux.go b/server/mux.go
@@ -40,7 +40,15 @@ var allowedMethods = []string{
 	http.MethodOptions,
 }
 
-func NewMux(opts *runtime.MuxOptions) *Mux {
+func NewMux(options *runtime.MuxOptions) *Mux {
+	opts := options
+	if opts == nil {
+		opts = &runtime.MuxOptions{
+			APIErrTpl:  errors.DefaultJSON,
+			FileErrTpl: errors.DefaultHTML,
+		}
+	}
+
 	mux := &Mux{
 		apiPath:        opts.APIPath,
 		apiErrHandler:  opts.APIErrTpl,