diff --git a/dindexer.yml b/dindexer.yml index d13cd0d..38242d4 100644 --- a/dindexer.yml +++ b/dindexer.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- -db_backend_name: postgresql -db_backend_settings: +backend_name: postgresql +postgresql_settings: username: your_username password: your_password dbname: dindexer diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 811a0f4..fa65122 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -33,13 +33,13 @@ namespace dinlib { try { auto settings = YAML::LoadFile(path); - if (not settings["db_backend_name"]) { + if (not settings["backend_name"]) { return false; } - parOut.backend_name = settings["db_backend_name"].as(); - if (settings["db_backend_settings"]) { - //parOut.db = settings["db_backend_settings"].as(); - auto settings_node = settings["db_backend_settings"]; + parOut.backend_name = settings["backend_name"].as(); + const std::string backend_settings_section = parOut.backend_name + "_settings"; + if (settings[backend_settings_section]) { + auto settings_node = settings[backend_settings_section]; parOut.backend_plugin = dindb::BackendPlugin(find_plugin_by_name(parOut.backend_name), &settings_node); return true; }