X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=defab848f9b7fa2bb79d071522ff43c48e715b96;hb=a4487d8a46d3e4400bf73ce817fa1a34cde31a6f;hp=124d7e4478743d9b916ec3da27c43d9f67e53bd7;hpb=b5cf93aed93e7f331eb645c8afe5317fb67ee50e;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 124d7e44..defab848 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 "IoT.bzh" + * Copyright (C) 2015, 2016 "IoT.bzh" * Author "Fulup Ar Foll" * Author José Bollo * @@ -17,6 +17,7 @@ */ #define _GNU_SOURCE +#define NO_PLUGIN_VERBOSE_MACRO #include #include @@ -41,13 +42,13 @@ #include "verbose.h" #include "afb-common.h" -#include "afb-plugin.h" +#include #if !defined(PLUGIN_INSTALL_DIR) #error "you should define PLUGIN_INSTALL_DIR" #endif -#define AFB_VERSION "0.4" +#define AFB_VERSION "0.5" // Define command line option #define SET_VERBOSE 1 @@ -131,7 +132,7 @@ static void printVersion (FILE *file) fprintf(file, "\n----------------------------------------- \n"); fprintf(file, " AFB [Application Framework Binder] version=%s |\n", AFB_VERSION); fprintf(file, " \n"); - fprintf(file, " Copyright(C) 2016 /IoT.bzh [fulup -at- iot.bzh]\n"); + fprintf(file, " Copyright (C) 2015, 2016 \"IoT.bzh\" [fulup -at- iot.bzh]\n"); fprintf(file, " AFB comes with ABSOLUTELY NO WARRANTY.\n"); fprintf(file, " Licence Apache 2\n\n"); exit (0); @@ -479,10 +480,10 @@ static int init_http_server(struct afb_hsrv *hsrv, struct afb_config * config) return 0; for (idx = 0; idx < config->aliascount; idx++) - if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, config->aliasdir[idx].path, 0)) + if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, config->aliasdir[idx].path, 0, 0)) return 0; - if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10)) + if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10, 1)) return 0; if (!afb_hsrv_add_handler(hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL, -20)) @@ -584,8 +585,12 @@ int main(int argc, char *argv[]) { exit (1); } - if (config->ldpaths) - afb_api_so_add_pathset(config->ldpaths); + if (config->ldpaths) { + if (afb_api_so_add_pathset(config->ldpaths) < 0) { + ERROR("initialisation of plugins within %s failed", config->ldpaths); + exit(1); + } + } start_items(config->items); config->items = NULL;