Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

be more verbose on broken configs

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-05-25 21:45:22 +02:00 committed by Patrick Niklaus
parent 824afdceca
commit d53350b263
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/storage/storage_config.cpp
View File

@ -1,4 +1,5 @@
#include "storage/storage_config.hpp" #include "storage/storage_config.hpp"
#include "util/simple_logger.hpp"
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
@ -21,19 +22,24 @@ StorageConfig::StorageConfig(const boost::filesystem::path &base)
bool StorageConfig::IsValid() const bool StorageConfig::IsValid() const
{ {
return boost::filesystem::is_regular_file(ram_index_path) && const constexpr auto num_files = 13;
boost::filesystem::is_regular_file(file_index_path) && const boost::filesystem::path paths[num_files] = {
boost::filesystem::is_regular_file(hsgr_data_path) && ram_index_path, file_index_path, hsgr_data_path, nodes_data_path,
boost::filesystem::is_regular_file(nodes_data_path) && edges_data_path, core_data_path, geometries_path, timestamp_path,
boost::filesystem::is_regular_file(edges_data_path) && datasource_indexes_path, datasource_indexes_path, names_data_path, properties_path,
boost::filesystem::is_regular_file(core_data_path) && intersection_class_path};
boost::filesystem::is_regular_file(geometries_path) &&
boost::filesystem::is_regular_file(timestamp_path) && bool success = true;
boost::filesystem::is_regular_file(datasource_names_path) && for (auto path = paths; path != paths + num_files; ++path)
boost::filesystem::is_regular_file(datasource_indexes_path) && {
boost::filesystem::is_regular_file(names_data_path) && if (!boost::filesystem::is_regular_file(*path))
boost::filesystem::is_regular_file(properties_path) && {
boost::filesystem::is_regular_file(intersection_class_path); util::SimpleLogger().Write(logWARNING) << "Missing/Broken File: " << path->string();
success = false;
}
}
return success;
} }
} }
} }

2
src/tools/store.cpp
View File

@ -84,7 +84,7 @@ int main(const int argc, const char *argv[]) try
storage::StorageConfig config(base_path); storage::StorageConfig config(base_path);
if (!config.IsValid()) if (!config.IsValid())
{ {
util::SimpleLogger().Write(logWARNING) << "Invalid file path given!"; util::SimpleLogger().Write(logWARNING) << "Config contains invalid file paths. Exiting!";
return EXIT_FAILURE; return EXIT_FAILURE;
} }
storage::Storage storage(std::move(config)); storage::Storage storage(std::move(config));