# HG changeset patch # User am@osimis.io # Date 1531129411 -7200 # Node ID 3686ba3f9cdb0a3dfada936dd726dbfde6f4e6da # Parent eff482803d30e9baa67131fc7cdb3334bcbcd48b don't include password in connection string if it is empty; it's seems its not supported by some pg drivers diff -r eff482803d30 -r 3686ba3f9cdb .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Jul 09 11:43:31 2018 +0200 @@ -0,0 +1,4 @@ +build* +PostgreSQL/CMakeLists.txt.user +PostgreSQL/ThirdPartyDownloads/ + diff -r eff482803d30 -r 3686ba3f9cdb Framework/PostgreSQL/PostgreSQLParameters.cpp --- a/Framework/PostgreSQL/PostgreSQLParameters.cpp Mon Jul 09 08:36:20 2018 +0200 +++ b/Framework/PostgreSQL/PostgreSQLParameters.cpp Mon Jul 09 11:43:31 2018 +0200 @@ -176,10 +176,14 @@ { target = std::string("sslmode=disable") + // TODO WHY SSL DOES NOT WORK? ("SSL error: wrong version number") " user=" + username_ + - " password=" + password_ + " host=" + host_ + " port=" + boost::lexical_cast(port_); + if (!password_.empty()) + { + target += " password=" + password_; + } + if (database_.size() > 0) { target += " dbname=" + database_; diff -r eff482803d30 -r 3686ba3f9cdb PostgreSQL/Plugins/IndexPlugin.cpp --- a/PostgreSQL/Plugins/IndexPlugin.cpp Mon Jul 09 08:36:20 2018 +0200 +++ b/PostgreSQL/Plugins/IndexPlugin.cpp Mon Jul 09 11:43:31 2018 +0200 @@ -106,7 +106,7 @@ ORTHANC_PLUGINS_API void OrthancPluginFinalize() { - LOG(WARNING) << "PostgreSQL storage area is finalizing"; + LOG(WARNING) << "PostgreSQL index area is finalizing"; backend_.reset(NULL); }