diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-12-10 12:26:20 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-12-10 12:26:20 -0800 |
| commit | 0da2efa633d8cc64db732704e80a74dd0a4e23b5 (patch) | |
| tree | ece30a0527efa9cc582a4d05040895fb0a3446cc | |
| parent | e23d95bf038c38fd07353415b752efa21a47ae7c (diff) | |
| download | infinitytier-0da2efa633d8cc64db732704e80a74dd0a4e23b5.tar.gz infinitytier-0da2efa633d8cc64db732704e80a74dd0a4e23b5.zip | |
add application_name to pgbouncer connectio string
| -rw-r--r-- | controller/PostgreSQL.cpp | 5 | ||||
| -rwxr-xr-x | cycle_controllers.sh | 1 | ||||
| -rw-r--r-- | docker/main.sh | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index e4a2a90b..db0537ec 100644 --- a/controller/PostgreSQL.cpp +++ b/controller/PostgreSQL.cpp @@ -1349,7 +1349,10 @@ PGconn *PostgreSQL::getPgConn(OverrideMode m) { char *connStr = getenv("PGBOUNCER_CONNSTR"); if (connStr != NULL) { fprintf(stderr, "PGBouncer Override\n"); - return PQconnectdb(connStr); + std::string conn(connStr); + conn += " application_name=controller-"; + conn += _myAddressStr.c_str(); + return PQconnectdb(conn.c_str()); } } diff --git a/cycle_controllers.sh b/cycle_controllers.sh index c02a1f9b..34acacf4 100755 --- a/cycle_controllers.sh +++ b/cycle_controllers.sh @@ -5,4 +5,5 @@ CONTROLLERS=`kubectl get pods -o=name | grep controller | sed "s/^.\{4\}//"` for c in ${CONTROLLERS[@]} do kubectl delete pod ${c} + sleep 30 done diff --git a/docker/main.sh b/docker/main.sh index 92b46b20..efb3fe84 100644 --- a/docker/main.sh +++ b/docker/main.sh @@ -12,6 +12,10 @@ if [ -z "$ZT_DB_PORT" ]; then echo '*** FAILED: ZT_DB_PORT environment variable not defined' exit 1 fi +if [ -z "$ZT_DB_NAME" ]; then + echo '*** FAILED: ZT_DB_NAME environment variable not defined' + exit 1 +fi if [ -z "$ZT_DB_USER" ]; then echo '*** FAILED: ZT_DB_USER environment variable not defined' exit 1 @@ -38,7 +42,7 @@ echo "{ \"inot\", \"nat64\" ], - \"controllerDbPath\": \"postgres:host=${ZT_DB_HOST} port=${ZT_DB_PORT} dbname=ztc user=${ZT_DB_USER} password=${ZT_DB_PASSWORD} sslmode=require sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}\" + \"controllerDbPath\": \"postgres:host=${ZT_DB_HOST} port=${ZT_DB_PORT} dbname=${ZT_DB_NAME} user=${ZT_DB_USER} password=${ZT_DB_PASSWORD} sslmode=prefer sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}\" } } " > /var/lib/zerotier-one/local.conf |