Maintain storage_config exposed API

This commit is contained in:
Pepijn Schoen
2017-07-07 16:42:07 +02:00
committed by Daniel J. H
parent 0b5c7a97a7
commit 8da40419ee
13 changed files with 52 additions and 34 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ int main(int argc, const char *argv[]) try
// Configure based on a .osrm base path, and no datasets in shared mem from osrm-datastore
EngineConfig config;
config.storage_config.UseDefaultOutputNames(argv[1]);
config.storage_config = {argv[1]};
config.use_shared_memory = false;
// Routing machine with several services (such as Route, Table, Nearest, Trip, Match)
+1 -1
View File
@@ -229,7 +229,7 @@ int main(int argc, const char *argv[]) try
}
if (!base_path.empty())
{
config.storage_config.UseDefaultOutputNames(base_path);
config.storage_config = storage::StorageConfig(base_path);
}
if (!config.use_shared_memory && !config.storage_config.IsValid())
{
+1 -2
View File
@@ -163,8 +163,7 @@ int main(const int argc, const char *argv[]) try
{
return EXIT_SUCCESS;
}
storage::StorageConfig config;
config.UseDefaultOutputNames(base_path);
storage::StorageConfig config(base_path);
if (!config.IsValid())
{
util::Log(logERROR) << "Config contains invalid file paths. Exiting!";