OP#176 edit start.sh

start.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-set -e
-
-if [[ "${DATABASE_URL}" = "" ]]; then
+if [[ "${DATABASE_URL}" == "" ]]; then
   echo 'Missing DATABASE_URL'
   echo 'example -e DATABASE_URL="user=<db user> password=<db user password> host=<db host> port=<db port> database=<db name>"'
   exit 1
@@ -14,38 +12,37 @@ function shutdown() {
   pkill -SIGINT postgresql-prometheus-adapter
 }
 
-adapter_send_timeout="${adapter_send_timeout:-'30s'}"
+adapter_send_timeout=${adapter_send_timeout:-'30s'}
 web_listen_address="${web_listen_address:-':9201'}"
 web_telemetry_path="${web_telemetry_path:-'/metrics'}"
 log_level="${log_level:-'info'}"
 log_format="${log_format:-'logfmt'}"
 pg_partition="${pg_partition:-'hourly'}"
-pg_commit_secs="${pg_commit_secs:-30}"
-pg_commit_rows="${pg_commit_rows:-20000}"
+pg_commit_secs=${pg_commit_secs:-30}
+pg_commit_rows=${pg_commit_rows:-20000}
 pg_threads="${pg_threads:-1}"
 parser_threads="${parser_threads:-5}"
 
-# Echo the full command (with vars expanded for logging; no DATABASE_URL for security)
-echo "/usr/local/bin/postgresql-prometheus-adapter \
---adapter-send-timeout ${adapter_send_timeout} \
---web-listen-address ${web_listen_address} \
---web-telemetry-path ${web_telemetry_path} \
---log.level ${log_level} \
---log.format ${log_format} \
---pg-partition ${pg_partition} \
---pg-commit-secs ${pg_commit_secs} \
---pg-commit-rows ${pg_commit_rows} \
---pg-threads ${pg_threads} \
---parser-threads ${parser_threads}"
+echo /postgresql-prometheus-adapter \
+  --adapter-send-timeout=${adapter_send_timeout} \
+  --web-listen-address=${web_listen_address} \
+  --web-telemetry-path=${web_telemetry_path} \
+  --log.level=${log_level} \
+  --log.format=${log_format} \
+  --pg-partition=${pg_partition} \
+  --pg-commit-secs=${pg_commit_secs} \
+  --pg-commit-rows=${pg_commit_rows} \
+  --pg-threads=${pg_threads} \
+  --parser-threads=${parser_threads}
 
-/usr/local/bin/postgresql-prometheus-adapter \
---adapter-send-timeout "${adapter_send_timeout}" \
---web-listen-address "${web_listen_address}" \
---web-telemetry-path "${web_telemetry_path}" \
---log.level "${log_level}" \
---log.format "${log_format}" \
---pg-partition "${pg_partition}" \
---pg-commit-secs "${pg_commit_secs}" \
---pg-commit-rows "${pg_commit_rows}" \
---pg-threads "${pg_threads}" \
---parser-threads "${parser_threads}"
+/postgresql-prometheus-adapter \
+  --adapter-send-timeout=${adapter_send_timeout} \
+  --web-listen-address=${web_listen_address} \
+  --web-telemetry-path=${web_telemetry_path} \
+  --log.level=${log_level} \
+  --log.format=${log_format} \
+  --pg-partition=${pg_partition} \
+  --pg-commit-secs=${pg_commit_secs} \
+  --pg-commit-rows=${pg_commit_rows} \
+  --pg-threads=${pg_threads} \
+  --parser-threads=${parser_threads}