diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c index 61e27897..acc889d0 100644 --- a/apps/restconf/restconf_main_native.c +++ b/apps/restconf/restconf_main_native.c @@ -1733,7 +1733,7 @@ restconf_clixon_init(clicon_handle h, if (clicon_nsctx_global_set(h, nsctx_global) < 0) goto done; if (inline_config != NULL && strlen(inline_config)){ - clicon_debug(1, "%s using restconf inline config", __FUNCTION__); + clicon_debug(1, "%s reading from inline config", __FUNCTION__); if ((ret = clixon_xml_parse_string(inline_config, YB_MODULE, yspec, &xrestconf, &xerr)) < 0) goto done; if (ret == 0){ @@ -1755,6 +1755,7 @@ restconf_clixon_init(clicon_handle h, goto done; } else if (clicon_option_bool(h, "CLICON_BACKEND_RESTCONF_PROCESS") == 0){ + clicon_debug(1, "%s reading from clixon config", __FUNCTION__); /* If not read from backend, try to get restconf config from local config-file */ if ((xrestconf = clicon_conf_restconf(h)) != NULL){ /*! Basic config init, set auth-type, pretty, etc ret 0 means disabled */ @@ -1772,6 +1773,7 @@ restconf_clixon_init(clicon_handle h, /* If no local config, or it is disabled, try to query backend of config. */ else { + clicon_debug(1, "%s reading from backend datastore config", __FUNCTION__); if ((ret = restconf_clixon_backend(h, xrestconfp)) < 0) goto done; if (ret == 0) diff --git a/docker/main/Dockerfile.native b/docker/main/Dockerfile.native index f8f1344a..37bce4e6 100644 --- a/docker/main/Dockerfile.native +++ b/docker/main/Dockerfile.native @@ -41,10 +41,12 @@ RUN apk add --update git make build-base gcc flex bison curl-dev # Create a directory to hold source-code, dependencies etc RUN mkdir /clixon -# evhtp -# dependencies +# evhtp dependencies RUN apk add --update libevent libevent-dev +# nghttp2 dependencies +RUN apk add --update nghttp2 + # clone libevhtp WORKDIR /clixon @@ -68,14 +70,14 @@ RUN ./configure --prefix=/clixon/build RUN make RUN make install +# Need to add www user manually +RUN adduser -D -H -G www-data www-data + # Copy Clixon from local dir RUN mkdir /clixon/clixon WORKDIR /clixon/clixon COPY clixon . -# Need to add www user manually -RUN adduser -D -H -G www-data www-data - # Configure, build and install clixon RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --enable-optyangs --with-restconf=native --enable-nghttp2 --enable-evhtp @@ -117,6 +119,9 @@ RUN adduser -D -H -G www-data www-data # for libevtp RUN apk add --update openssl libevent +# nghttp2 dependencies +RUN apk add --update nghttp2 + # Test-specific (for test scripts) RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip - but CAP_SYS_ADMIN isssue @@ -135,5 +140,5 @@ RUN mkdir /www-data RUN chown clicon /www-data RUN chgrp clicon /www-data -# Log to stderr. +# Start the backend and restconf deamons CMD /usr/local/bin/startsystem.sh diff --git a/example/main/example.xml b/example/main/example.xml index 63272346..d745a759 100644 --- a/example/main/example.xml +++ b/example/main/example.xml @@ -14,9 +14,9 @@ 1 VARS clixon-restconf - /usr/local/var/example 0 0 + /usr/local/var/example init disabled true diff --git a/lib/src/clixon_datastore.c b/lib/src/clixon_datastore.c index 60dd9f74..583c3206 100644 --- a/lib/src/clixon_datastore.c +++ b/lib/src/clixon_datastore.c @@ -539,7 +539,7 @@ xmldb_empty_get(clicon_handle h, return de->de_empty; } -/*! Get modified flag from datastore +/*! Set modified flag from datastore * @param[in] h Clicon handle * @param[in] db Database name * @param[in] value 0 or 1 diff --git a/test/test_type.sh b/test/test_type.sh index 81660f35..77259fed 100755 --- a/test/test_type.sh +++ b/test/test_type.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Advanced union types and generated code # and enum w values -# The test is run twice, first with dbcache turned on, then turned off. +# The test is run three times, with dbcache turned on, cache off and zero-copy # It is the only test with dbcache off. # Magic line must be first in script (see README.md)