Fix (gateway) merge of service settings order

moleculer-go · Sep 18, 2019 · 9902a29 · 9902a29
1 parent e3a1eed
commit 9902a29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gateway.go b/gateway.go
@@ -341,7 +341,7 @@ func (svc *HttpService) startServer(context moleculer.BrokerContext) {
 // Started httpService started. It process the settings (default + params), starts a http server,
 // notify the plugins that the http server is starting.
 func (svc *HttpService) Started(context moleculer.BrokerContext, schema moleculer.ServiceSchema) {
-	svc.settings = service.MergeSettings(defaultSettings, svc.Settings)
+	svc.settings = service.MergeSettings(defaultSettings, schema.Settings, svc.Settings)
 	address := svc.getAddress()
 	svc.server = &http.Server{Addr: address}
 	svc.router = mux.NewRouter()

diff --git a/gateway_integration_test.go b/gateway_integration_test.go
@@ -124,7 +124,7 @@ var _ = Describe("API Gateway Integration Tests", func() {
 
 			response, err := http.Get("http://localhost:3552/printer/print?content=HellowWorld")
 			Expect(err).Should(BeNil())
-			Expect(bodyContent(response)).Should(Equal("printed content: HellowWorld"))
+			Expect(bodyContent(response)).Should(Equal("printed content: Hello World"))
 
 			servicesBkr.Stop()
 			gatewayBkr.Stop()