This commit is contained in:
Olof hagsand 2019-03-25 11:26:57 +01:00
parent a0abf8436e
commit b9df1ed5b3
3 changed files with 5 additions and 2 deletions

View file

@ -112,6 +112,8 @@ backend_terminate(clicon_handle h)
clixon_plugin_exit(h); clixon_plugin_exit(h);
/* Delete all backend plugin RPC callbacks */ /* Delete all backend plugin RPC callbacks */
rpc_callback_delete_all(); rpc_callback_delete_all();
/* Delete all backend plugin upgrade callbacks */
upgrade_callback_delete_all();
if (pidfile) if (pidfile)
unlink(pidfile); unlink(pidfile);

View file

@ -270,6 +270,8 @@ startup_extraxml(clicon_handle h,
goto fail; goto fail;
retval = 1; retval = 1;
done: done:
if (xt)
xml_free(xt);
if (xmldb_delete(h, "tmp") != 0 && errno != ENOENT) if (xmldb_delete(h, "tmp") != 0 && errno != ENOENT)
return -1; return -1;
return retval; return retval;

View file

@ -36,7 +36,6 @@ cat <<EOF > $cfg
<CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK> <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
<CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR> <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
<CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE> <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
<CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
<CLICON_XMLDB_DIR>$dbdir</CLICON_XMLDB_DIR> <CLICON_XMLDB_DIR>$dbdir</CLICON_XMLDB_DIR>
<CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN> <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
</clixon-config> </clixon-config>