[syslog-ng] [PATCH (3.4) 2/5] afmongodb: Convert to mongo_sync_*

[Gergely Nagy]

In preparation to support other things, and to slightly reduce code
complexity, convert the MongoDB destination driver to use the mongo_sync
family of functions.

Signed-Off-By: Gergely Nagy <algernon at balabit.hu>
---
 modules/afmongodb/afmongodb.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/afmongodb/afmongodb.c b/modules/afmongodb/afmongodb.c
index f526bc1..48df68f 100644
--- a/modules/afmongodb/afmongodb.c
+++ b/modules/afmongodb/afmongodb.c
@@ -77,7 +77,7 @@ typedef struct
   LogQueue *queue;
 
   /* Writer-only stuff */
-  mongo_connection *conn;
+  mongo_sync_connection *conn;
   gint32 seq_num;
 
   gchar *ns;
@@ -189,7 +189,7 @@ afmongodb_dd_suspend(MongoDBDestDriver *self)
 static void
 afmongodb_dd_disconnect(MongoDBDestDriver *self)
 {
-  mongo_disconnect(self->conn);
+  mongo_sync_disconnect(self->conn);
   self->conn = NULL;
 }
 
@@ -199,7 +199,7 @@ afmongodb_dd_connect(MongoDBDestDriver *self, gboolean reconnect)
   if (reconnect && self->conn)
     return TRUE;
 
-  self->conn = mongo_connect(self->host, self->port);
+  self->conn = mongo_sync_connect(self->host, self->port, FALSE);
 
   if (!self->conn)
     {
@@ -255,7 +255,6 @@ static gboolean
 afmongodb_worker_insert (MongoDBDestDriver *self)
 {
   gboolean success;
-  mongo_packet *p;
   guint8 *oid;
   LogMessage *msg;
   LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
@@ -288,10 +287,8 @@ afmongodb_worker_insert (MongoDBDestDriver *self)
   bson_append_document (self->bson_upd, "$set", self->bson_set);
   bson_finish (self->bson_upd);
 
-  p = mongo_wire_cmd_update (1, self->ns, 1,
-			     self->bson_sel, self->bson_upd);
-
-  if (!mongo_packet_send (self->conn, p))
+  if (!mongo_sync_cmd_update (self->conn, self->ns, MONGO_WIRE_FLAG_UPDATE_UPSERT,
+			      self->bson_sel, self->bson_upd))
     {
       msg_error ("Network error while inserting into MongoDB",
 		 evt_tag_int("time_reopen", self->time_reopen),
@@ -299,8 +296,6 @@ afmongodb_worker_insert (MongoDBDestDriver *self)
       success = FALSE;
     }
 
-  mongo_wire_packet_free (p);
-
   msg_set_context(NULL);
 
   if (success)
-- 
1.7.7.3