From 92196dc20775bc9e68d78fcd22e696dd47d333ea Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sat, 12 Oct 2013 15:20:58 +0200 Subject: [PATCH] pull config from program options --- Tools/simpleclient.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Tools/simpleclient.cpp b/Tools/simpleclient.cpp index a4588a5db..7bb53837d 100644 --- a/Tools/simpleclient.cpp +++ b/Tools/simpleclient.cpp @@ -44,13 +44,30 @@ void print_tree(boost::property_tree::ptree const& pt, const unsigned recursion_ } -int main (int argc, char * argv[]) { +int main (int argc, const char * argv[]) { LogPolicy::GetInstance().Unmute(); try { - std::cout << "\n starting up engines, compile at " - << __DATE__ << ", " __TIME__ << std::endl; - IniFile serverConfig((argc > 1 ? argv[1] : "server.ini")); - OSRM routing_machine((argc > 1 ? argv[1] : "server.ini")); + std::string ip_address; + int ip_port, requested_num_threads; + + ServerPaths server_paths; + if( !GenerateServerProgramOptions( + argc, + argv, + server_paths, + ip_address, + ip_port, + requested_num_threads + ) + ) { + return 0; + } + + SimpleLogger().Write() << + "starting up engines, " << g_GIT_DESCRIPTION << ", " << + "compiled at " << __DATE__ << ", " __TIME__; + + OSRM routing_machine(server_paths); RouteParameters route_parameters; route_parameters.zoomLevel = 18; //no generalization