From dc61f78916aeaaa8eb91bbc1dbd1d9b5321ba49f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 2 Sep 2021 11:23:45 -0700 Subject: [PATCH] set psql application_name in startup script --- controller/PostgreSQL.cpp | 2 +- ext/central-controller-docker/main.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index 5d48ce1f0..4550e8722 100644 --- a/controller/PostgreSQL.cpp +++ b/controller/PostgreSQL.cpp @@ -150,7 +150,7 @@ PostgreSQL::PostgreSQL(const Identity &myId, const char *path, int listenPort, R { char myAddress[64]; _myAddressStr = myId.address().toString(myAddress); - _connString = std::string(path) + " application_name=controller_" + _myAddressStr; + _connString = std::string(path); auto f = std::make_shared(_connString); _pool = std::make_shared >( 15, 5, std::static_pointer_cast(f)); diff --git a/ext/central-controller-docker/main.sh b/ext/central-controller-docker/main.sh index fc724017b..7a1086907 100755 --- a/ext/central-controller-docker/main.sh +++ b/ext/central-controller-docker/main.sh @@ -62,9 +62,11 @@ popd DEFAULT_PORT=9993 +APP_NAME="controller-$(cat /var/lib/zerotier-one/identity.public | cut -d ':' -f 1)" + echo "{ \"settings\": { - \"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}\", + \"controllerDbPath\": \"postgres:host=${ZT_DB_HOST} port=${ZT_DB_PORT} dbname=${ZT_DB_NAME} user=${ZT_DB_USER} password=${ZT_DB_PASSWORD} application_name=${APP_NAME} sslmode=prefer sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}\", \"portMappingEnabled\": true, \"softwareUpdate\": \"disable\", \"interfacePrefixBlacklist\": [