Mon, 13 Feb 2012 13:49:49 +0100
New configuration loader
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2011 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include <dlfcn.h> #include "../public/nsapi.h" #include "../util/systhr.h" #include "func.h" #include "config.h" #include "configmanager.h" #include "httplistener.h" #include "webserver.h" extern struct FuncStruct webserver_funcs[]; int webserver_init() { // init NSPR systhread_init("webserver"); // init NSAPI functions func_init(); add_functions(webserver_funcs); // load init.conf load_init_conf("conf/init.conf"); // load server.conf init_configuration_manager(); if(cfgmgr_load_config() != 0) { fprintf(stderr, "Cannot load configuration\n"); return -1; } // init NSAPI functions return 0; } int webserver_run() { printf("webserver_run\n"); // start all http listener if(start_all_listener() != 0) { fprintf(stderr, "Error: Cannot start http listener\n"); } return 0; } void webserver_atrestart(void (*fn)(void *), void *data) { /* * TODO: implement later * only for mod_jk at this time */ }