diff --git a/jmeter/golang-http-benchmark.jmx b/jmeter/golang-http-benchmark.jmx index 2548407..bd8d96e 100644 --- a/jmeter/golang-http-benchmark.jmx +++ b/jmeter/golang-http-benchmark.jmx @@ -55,6 +55,33 @@ false + + ${__jexl3("${scenario}" == "nginx",)} + false + true + + + + + + + ${server_hostname} + 80 + http + + / + GET + true + false + true + false + + HttpClient4 + + + + + ${__jexl3("${scenario}" == "golang-net-http",)} false diff --git a/jmeter/run.sh b/jmeter/run.sh index ad0545b..79a6471 100755 --- a/jmeter/run.sh +++ b/jmeter/run.sh @@ -6,7 +6,7 @@ set -e # Do not continue if jmeter fails export HEAP="-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m" date="$(date +%F-%H-%M-%S)" -for scenario in golang-net-http golang-fasthttp; do +for scenario in nginx golang-net-http golang-fasthttp; do echo echo "================================================================================" echo "Running scenario $scenario..." diff --git a/nginx/deploy.sh b/nginx/deploy.sh new file mode 100755 index 0000000..e78bc6f --- /dev/null +++ b/nginx/deploy.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo "Usage: $0 user@target.hostname" + exit 1 +fi + +set -xe + +ssh $1 mkdir -p /srv/nginx/default/ +echo "Hello, World!" | ssh $1 tee /srv/nginx/default/index.html +scp nginx.conf $1:/etc/nginx/nginx.conf +ssh $1 /etc/init.d/nginx restart || true +ssh $1 pgrep nginx +curl http://$1/ diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..6c7e1a5 --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,34 @@ +user nobody nogroup; + +worker_processes auto; +worker_cpu_affinity auto; + +error_log syslog:server=unix:/dev/log,nohostname crit; + +events { + worker_connections 1024; + multi_accept on; +} + +http { + # don't leak nginx version number in the "Server" HTTP Header + server_tokens off; + + server_names_hash_bucket_size 64; + include mime.types; + + access_log off; + + sendfile on; + keepalive_timeout 65; + gzip off; + + server { + listen 0.0.0.0:80 deferred; + + # Main content + root /srv/nginx/default; + index index.html index.htm; + } +} +