X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwrite_mongodb.c;h=f13cdc332b5155cbb9a0893cf87345d79921cacf;hb=b9cd6ea32dd72d250727db1b76e4bc978d005574;hp=900fb8786b6e6aaa00d98c83faf812e033cdb9dd;hpb=575200360174d98b14f7377a7aa74ae702960bcb;p=collectd.git

diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 900fb878..f13cdc33 100644
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -39,16 +39,6 @@
 #endif
 #include <mongo.h>
 
-/*
-struct mongo_options
-{
-  char *host;
-  int port;
-  int timeout;
-};
-typedef struct mongo_options mongo_options;
-*/
-
 struct wm_node_s
 {
   char name[DATA_MAX_NAME_LEN];
@@ -60,7 +50,6 @@ struct wm_node_s
   int connected;
 
   mongo conn[1];
-/*  mongo_options opts[1]; */
   pthread_mutex_t lock;
 };
 typedef struct wm_node_s wm_node_t;
@@ -77,12 +66,11 @@ static int wm_write (const data_set_t *ds, /* {{{ */
   int status;
   int i;
   bson record;
-  /*bson_data record_buf; */
 
   ssnprintf(collection_name, sizeof (collection_name), "collectd.%s", vl->plugin);
 
   bson_init(&record);
-  bson_append_time_t(&record,"ts",vl->time);
+  bson_append_time_t(&record,"ts",CDTIME_T_TO_TIME_T(vl->time));
   bson_append_string(&record,"h",vl->host);
   bson_append_string(&record,"i",vl->plugin_instance);
   bson_append_string(&record,"t",vl->type);
@@ -101,7 +89,7 @@ static int wm_write (const data_set_t *ds, /* {{{ */
     else
       assert (23 == 42);
   }
-
+  bson_finish(&record);
 
   pthread_mutex_lock (&node->lock);
 
@@ -137,11 +125,15 @@ static int wm_write (const data_set_t *ds, /* {{{ */
 
   if(status != MONGO_OK)
   {
-    ERROR ( "write_mongodb plugin: error inserting record: ");
-    if(node->conn->err == MONGO_BSON_INVALID) 
+    ERROR ( "write_mongodb plugin: error inserting record: %d", node->conn->err);
+    if(node->conn->err == MONGO_BSON_INVALID)
+    {
+      ERROR (node->conn->errstr);
+    } else if ( record.err)
     {
       ERROR (record.errstr);
     }
+
   }