rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-22 01:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added compilation time mongo-c-driver version check to not use deprecated mongoc function when newer are available in the logctl usertool.

Browse Source
This commit is contained in:
Hugo SOSZYNSKI 2017-11-17 16:29:30 +01:00
parent 1ab4bfb0e7
commit 85a4f9d589
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/logctl.c
View File

@ -361,12 +361,22 @@ struct db_cursor* launch_query(struct queryopt *opt, struct select_doc *s_doc,
struct db_cursor *out;
out = malloc (sizeof(struct db_cursor));
#if MONGOC_CHECK_VERSION (1, 5, 0)
const bson_t *opts = BCON_NEW (
"skip", BCON_INT32 (opt->e_skip),
"limit", BCON_INT32 (opt->e_ret)
);
out->cursor = mongoc_collection_find_with_opts (db_coll->collection,
qu_doc->query, opts,
NULL);
#else
out->cursor = mongoc_collection_find (db_coll->collection,
MONGOC_QUERY_NONE,
(uint32_t)opt->e_skip,
(uint32_t)opt->e_ret, 0,
qu_doc->query, s_doc->select,
NULL);
#endif
if (!out->cursor)
{
perror ("mongo_sync_cmd_query()");