generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-31 06:35:03 +01:00
Code Issues Projects Releases Wiki Activity

fixed GH #198: The application.configDir property is not always created.

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-11-20 00:12:54 +01:00
parent 340594b2ae
commit e6ea29c26e
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Util/src/Application.cpp
View File

@ -219,39 +219,39 @@ int Application::loadConfiguration(int priority)
int n = 0; int n = 0;
Path appPath; Path appPath;
getApplicationPath(appPath); getApplicationPath(appPath);
Path cfgPath; Path confPath;
if (findAppConfigFile(appPath.getBaseName(), "properties", cfgPath)) if (findAppConfigFile(appPath.getBaseName(), "properties", confPath))
{ {
_pConfig->add(new PropertyFileConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new PropertyFileConfiguration(confPath.toString()), priority, false, false);
++n; ++n;
} }
#ifndef POCO_UTIL_NO_INIFILECONFIGURATION #ifndef POCO_UTIL_NO_INIFILECONFIGURATION
if (findAppConfigFile(appPath.getBaseName(), "ini", cfgPath)) if (findAppConfigFile(appPath.getBaseName(), "ini", confPath))
{ {
_pConfig->add(new IniFileConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new IniFileConfiguration(confPath.toString()), priority, false, false);
++n; ++n;
} }
#endif #endif
#ifndef POCO_UTIL_NO_JSONCONFIGURATION #ifndef POCO_UTIL_NO_JSONCONFIGURATION
if (findAppConfigFile(appPath.getBaseName(), "json", cfgPath)) if (findAppConfigFile(appPath.getBaseName(), "json", confPath))
{ {
_pConfig->add(new JSONConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new JSONConfiguration(confPath.toString()), priority, false, false);
++n; ++n;
} }
#endif #endif
#ifndef POCO_UTIL_NO_XMLCONFIGURATION #ifndef POCO_UTIL_NO_XMLCONFIGURATION
if (findAppConfigFile(appPath.getBaseName(), "xml", cfgPath)) if (findAppConfigFile(appPath.getBaseName(), "xml", confPath))
{ {
_pConfig->add(new XMLConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new XMLConfiguration(confPath.toString()), priority, false, false);
++n; ++n;
} }
#endif #endif
if (n > 0) if (n > 0)
{ {
if (!cfgPath.isAbsolute()) if (!confPath.isAbsolute())
_pConfig->setString("application.configDir", cfgPath.absolute().parent().toString()); _pConfig->setString("application.configDir", confPath.absolute().parent().toString());
else else
_pConfig->setString("application.configDir", cfgPath.parent().toString()); _pConfig->setString("application.configDir", confPath.parent().toString());
} }
return n; return n;
} }
@ -259,24 +259,44 @@ int Application::loadConfiguration(int priority)
void Application::loadConfiguration(const std::string& path, int priority) void Application::loadConfiguration(const std::string& path, int priority)
{ {
int n = 0;
Path confPath(path); Path confPath(path);
std::string ext = confPath.getExtension(); std::string ext = confPath.getExtension();
if (icompare(ext, "properties") == 0) if (icompare(ext, "properties") == 0)
{
_pConfig->add(new PropertyFileConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new PropertyFileConfiguration(confPath.toString()), priority, false, false);
++n;
}
#ifndef POCO_UTIL_NO_INIFILECONFIGURATION #ifndef POCO_UTIL_NO_INIFILECONFIGURATION
else if (icompare(ext, "ini") == 0) else if (icompare(ext, "ini") == 0)
{
_pConfig->add(new IniFileConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new IniFileConfiguration(confPath.toString()), priority, false, false);
++n;
}
#endif #endif
#ifndef POCO_UTIL_NO_JSONCONFIGURATION #ifndef POCO_UTIL_NO_JSONCONFIGURATION
else if (icompare(ext, "json") == 0) else if (icompare(ext, "json") == 0)
{
_pConfig->add(new JSONConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new JSONConfiguration(confPath.toString()), priority, false, false);
++n;
}
#endif #endif
#ifndef POCO_UTIL_NO_XMLCONFIGURATION #ifndef POCO_UTIL_NO_XMLCONFIGURATION
else if (icompare(ext, "xml") == 0) else if (icompare(ext, "xml") == 0)
{
_pConfig->add(new XMLConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new XMLConfiguration(confPath.toString()), priority, false, false);
++n;
}
#endif #endif
else else throw Poco::InvalidArgumentException("Unsupported configuration file type", ext);
throw Poco::InvalidArgumentException("Unsupported configuration file type", ext);
if (n > 0 && !_pConfig->has("application.configDir"))
{
if (!confPath.isAbsolute())
_pConfig->setString("application.configDir", confPath.absolute().parent().toString());
else
_pConfig->setString("application.configDir", confPath.parent().toString());
}
} }