X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=815d11f387c516e28810aef2778599d619ed5641;hb=5d293eac235f2d59eccc9b23de803821b821c12e;hp=29d7241dc80aa48504ac957c8cb319b8e998928f;hpb=e7c246a1b0d30b8156c7033061a61ecb5d2bdfc8;p=src%2Fapp-framework-binder.git diff --git a/src/config.c b/src/config.c index 29d7241d..815d11f3 100644 --- a/src/config.c +++ b/src/config.c @@ -21,13 +21,11 @@ */ - #include "../include/local-def.h" #include #include #include - #define AFB_CONFIG_JTYPE "AFB_config" PUBLIC char *ERROR_LABEL[]=ERROR_LABEL_DEF; @@ -71,6 +69,10 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) { // default Plugin API timeout if (cliconfig->apiTimeout == 0) session->config->apiTimeout=DEFLT_API_TIMEOUT; else session->config->apiTimeout=cliconfig->apiTimeout; + + // default AUTH_TOKEN + if (cliconfig->token == NULL) session->config->token= DEFLT_AUTH_TOKEN; + else session->config->token=cliconfig->token; // cache timeout default one hour if (cliconfig->cacheTimeout == 0) session->config->cacheTimeout=DEFLT_CACHE_TIMEOUT; @@ -112,8 +114,8 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) { session->config->smack= cliconfig->smack; } - if (cliconfig->smack == NULL) { - session->config->plugins = "all"; + if (cliconfig->plugins == NULL) { + session->config->plugins = PLUGIN_INSTALL_DIR; } else { session->config->plugins= cliconfig->plugins; } @@ -303,9 +305,6 @@ PUBLIC AFB_session *configInit () { } verbose = verbosesav; - // Load Plugins - initPlugins (session); - return (session); }