experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xml-stats moved from clixon-config.yang as state data to an rpc datastatsin clixon-lib.yang

Browse source 
* Two new plugin callbacks added
  * ca_daemon: Called just after a server has "daemonized", ie put in background.
  * ca_trans_commit_done: Called when all plugin commits have been done.
This commit is contained in:
Olof hagsand 2020-04-23 22:58:57 +02:00
parent 65806f1ef2
commit 1c99bd6a9b
20 changed files with 290 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/clixon_plugin.c
View file

@ -471,7 +471,7 @@ clixon_plugin_extension(clicon_handle h,
return retval;
}
/*! Call plugingeneral-purpose datastore upgrade in all plugins
/*! Call plugin general-purpose datastore upgrade in all plugins
*
* @param[in] h Clicon handle
* @param[in] db Name of datastore, eg "running", "startup" or "tmp"

5
lib/src/clixon_proto_client.c
View file

@ -1011,7 +1011,10 @@ clicon_rpc_debug(clicon_handle h,
goto done;
username = clicon_username_get(h);
if ((msg = clicon_msg_encode(session_id,
"<rpc username=\"%s\"><debug xmlns=\"http://clicon.org/lib\"><level>%d</level></debug></rpc>", username?username:"", level)) == NULL)
"<rpc username=\"%s\"><debug xmlns=\"%s\"><level>%d</level></debug></rpc>",
username?username:"",
CLIXON_LIB_NS,
level)) == NULL)
goto done;
if (clicon_rpc_msg(h, msg, &xret, NULL) < 0)
goto done;

14
lib/src/clixon_xml.c
View file

@ -284,18 +284,24 @@ xml_stats_one(cxobj *x,
}
/*! Return statistics of an XML tree recursively
* @param[in] x XML object
* @param[in] xt XML object
* @param[out] szp Size of this XML obj recursively
* @retval 0 OK
* @retval -1 Error
*/
size_t
int
xml_stats(cxobj *xt,
uint64_t *nrp,
size_t *szp)
{
int retval = -1;
size_t sz = 0;
cxobj *xc;
if (xt == NULL){
clicon_err(OE_XML, EINVAL, "xml node is NULL");
goto done;
}
*nrp += 1;
xml_stats_one(xt, &sz);
if (szp)
@ -308,7 +314,9 @@ xml_stats(cxobj *xt,
*szp += sz;
}
clicon_debug(1, "%s %zu", __FUNCTION__, *szp);
return 0;
retval = 0;
done:
return retval;
}
/*