diff --git a/docker-compose.yaml b/docker-compose.yaml index 43a7043..c5e5c46 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -38,7 +38,7 @@ services: networks: - rest-network volumes: - - ./nginx.conf:/etc/nginx/conf.d/default.conf + - ./nginx.conf:/etc/nginx/nginx.conf ports: - '80:80' depends_on: diff --git a/nginx.conf b/nginx.conf index fbfe2f8..cac668e 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,12 +1,19 @@ -upstream loadbalancer { - server app:8080; - server app2:8080; +worker_processes 4; + +events { + worker_connections 250; } -server { - listen 80; - server_name localhost; - location / { - proxy_pass http://loadbalancer; +http { + upstream backend { + server app:8080; + server app2:8081; + } + + server { + listen 80; + location / { + proxy_pass http://backend; + } } -} \ No newline at end of file +} diff --git a/rest-service-test.jmx b/rest-service-test.jmx index 4e26383..5b7cdda 100644 --- a/rest-service-test.jmx +++ b/rest-service-test.jmx @@ -5,18 +5,19 @@ + false + false - 50 - 10 + 100 + 100 60 3 true - true continue - 10 + 5 false @@ -25,7 +26,6 @@ localhost - 8080 http employees true @@ -37,7 +37,7 @@ - + localhost 8080 http @@ -60,7 +60,7 @@ - + Content-Type @@ -70,7 +70,7 @@ - + localhost 8080 http @@ -93,7 +93,7 @@ - + Content-Type @@ -117,13 +117,13 @@ - + localhost 8080 http employees/1 true - GET + DELETE true false @@ -131,7 +131,7 @@ - + localhost 8080 http @@ -154,8 +154,6 @@ - - false