From 83f0a2c0945de6f60633546584672d5ebdcb57e8 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Sun, 11 Aug 2013 22:49:33 +0200 Subject: [PATCH] Applying syntactic sugar --- Server/ServerFactory.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Server/ServerFactory.h b/Server/ServerFactory.h index bddb860e2..60502e257 100644 --- a/Server/ServerFactory.h +++ b/Server/ServerFactory.h @@ -16,33 +16,31 @@ You should have received a copy of the GNU Affero General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or see http://www.gnu.org/licenses/agpl.txt. - - Created on: 26.11.2010 - Author: dennis - */ #ifndef SERVERFACTORY_H_ #define SERVERFACTORY_H_ -#include #include "Server.h" - #include "../Util/IniFile.h" -#include "../Util/OpenMPWrapper.h" -#include "../Util/OSRMException.h" #include "../Util/SimpleLogger.h" #include "../Util/StringUtil.h" -struct ServerFactory { +#include + +#include + +struct ServerFactory : boost::noncopyable { static Server * CreateServer( IniFile & serverConfig ) { int threads = omp_get_num_procs(); if( serverConfig.GetParameter("IP").empty() ) { serverConfig.SetParameter("IP", "0.0.0.0"); } + if( serverConfig.GetParameter("Port").empty() ) { serverConfig.SetParameter("Port", "5000"); } + if( stringToInt(serverConfig.GetParameter("Threads")) >= 1 && stringToInt(serverConfig.GetParameter("Threads")) <= threads @@ -52,6 +50,7 @@ struct ServerFactory { SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion(); + Server * server = new Server( serverConfig.GetParameter("IP"), serverConfig.GetParameter("Port"),