stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed some issues with configuration.

Browse source
This commit is contained in:
Daniel Henninger 2013-01-11 17:01:10 -05:00
parent 83cf0ca770
commit 1c6130346b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pqxxbackend.cpp
View file

@ -49,10 +49,10 @@ void PQXXBackend::disconnect() {
bool PQXXBackend::connect() {
std::string connection_str;
connection_str = CONFIG_STRING(m_config, "database.connectionstring");
connection_str = CONFIG_STRING_DEFAULTED(m_config, "database.connectionstring", "");
if (connection_str.empty()) {
LOG4CXX_INFO(logger, "Connecting PostgreSQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
CONFIG_STRING(m_config, "database.user") << ", dbname " << CONFIG_STRING(m_config, "database.database") <<
", port " << CONFIG_INT(m_config, "database.port")
);
connection_str = "dbname=";
@ -66,8 +66,8 @@ bool PQXXBackend::connect() {
if (!CONFIG_STRING(m_config, "database.password").empty()) {
connection_str += " password=" + CONFIG_STRING(m_config, "database.password");
}
if (!CONFIG_STRING(m_config, "database.port").empty()) {
connection_str += " port=" + CONFIG_STRING(m_config, "database.password");
if (CONFIG_INT(m_config, "database.port") != 0) {
connection_str += " port=" + boost:lexical_cast<std::string>(CONFIG_INT(m_config, "database.port"));
}
}
else {