diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 9939c914e124e4c66a2868bd54453156c3b8e4f4..24151ceb720a3a29a055a0a24e7cdc6993661d45 100644 (file)
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
/**
* collectd - src/write_mongodb.c
- * Copyright (C) 2010-2012 Florian Forster
+ * Copyright (C) 2010-2013 Florian Forster
* Copyright (C) 2010 Akkarit Sangpetch
* Copyright (C) 2012 Chris Lundquist
*
* DEALINGS IN THE SOFTWARE.
*
* Authors:
- * Florian Forster <ff at octo.it>
+ * Florian Forster <octo at collectd.org>
* Akkarit Sangpetch <asangpet at andrew.cmu.edu>
* Chris Lundquist <clundquist at bluebox.net>
**/
#endif
#include <mongo.h>
+#if (MONGO_MAJOR == 0) && (MONGO_MINOR < 8)
+# define bson_alloc() bson_create()
+# define bson_dealloc(b) bson_dispose(b)
+#endif
+
struct wm_node_s
{
char name[DATA_MAX_NAME_LEN];
int port;
int timeout;
- int connected;
+ /* Authentication information */
+ char *db;
+ char *user;
+ char *passwd;
_Bool store_rates;
gauge_t *rates;
int i;
- ret = bson_create ();
+ ret = bson_alloc (); /* matched by bson_dealloc() */
if (ret == NULL)
{
ERROR ("write_mongodb plugin: bson_create failed.");
rates = NULL;
}
- bson_init (ret);
+ bson_init (ret); /* matched by bson_destroy() */
bson_append_date (ret, "time", (bson_date_t) CDTIME_T_TO_MS (vl->time));
bson_append_string (ret, "host", vl->host);
bson_append_string (ret, "plugin", vl->plugin);
pthread_mutex_lock (&node->lock);
- if (node->connected == 0)
+ if (!mongo_is_connected (node->conn))
{
- status = mongo_connect(node->conn, node->host, node->port);
+ INFO ("write_mongodb plugin: Connecting to [%s]:%i",
+ (node->host != NULL) ? node->host : "localhost",
+ (node->port != 0) ? node->port : MONGO_DEFAULT_PORT);
+ status = mongo_connect (node->conn, node->host, node->port);
if (status != MONGO_OK) {
- ERROR ("write_mongodb plugin: Connecting to host \"%s\" (port %i) failed.",
+ ERROR ("write_mongodb plugin: Connecting to [%s]:%i failed.",
(node->host != NULL) ? node->host : "localhost",
(node->port != 0) ? node->port : MONGO_DEFAULT_PORT);
- mongo_destroy(node->conn);
+ mongo_destroy (node->conn);
pthread_mutex_unlock (&node->lock);
return (-1);
}
+ if ((node->db != NULL) && (node->user != NULL) && (node->passwd != NULL))
+ {
+ status = mongo_cmd_authenticate (node->conn,
+ node->db, node->user, node->passwd);
+ if (status != MONGO_OK)
+ {
+ ERROR ("write_mongodb plugin: Authenticating to [%s]%i for database "
+ "\"%s\" as user \"%s\" failed.",
+ (node->host != NULL) ? node->host : "localhost",
+ (node->port != 0) ? node->port : MONGO_DEFAULT_PORT,
+ node->db, node->user);
+ mongo_destroy (node->conn);
+ pthread_mutex_unlock (&node->lock);
+ return (-1);
+ }
+ }
+
if (node->timeout > 0) {
status = mongo_set_op_timeout (node->conn, node->timeout);
if (status != MONGO_OK) {
node->timeout, node->conn->errstr);
}
}
-
- node->connected = 1;
}
/* Assert if the connection has been established */
- assert (node->connected == 1);
+ assert (mongo_is_connected (node->conn));
+
+ #if MONGO_MINOR >= 6
+ /* There was an API change in 0.6.0 as linked below */
+ /* https://github.com/mongodb/mongo-c-driver/blob/master/HISTORY.md */
+ status = mongo_insert (node->conn, collection_name, bson_record, NULL);
+ #else
+ status = mongo_insert (node->conn, collection_name, bson_record);
+ #endif
- status = mongo_insert (node->conn, collection_name, bson_record);
- if(status != MONGO_OK)
+ if (status != MONGO_OK)
{
ERROR ( "write_mongodb plugin: error inserting record: %d", node->conn->err);
- if (node->conn->err == MONGO_BSON_INVALID)
+ if (node->conn->err != MONGO_BSON_INVALID)
ERROR ("write_mongodb plugin: %s", node->conn->errstr);
- else if (bson_record->err)
- ERROR ("write_mongodb plugin: %s", bson_record->errstr);
+ else
+ ERROR ("write_mongodb plugin: Invalid BSON structure, error = %#x",
+ (unsigned int) bson_record->err);
+
+ /* Disconnect except on data errors. */
+ if ((node->conn->err != MONGO_BSON_INVALID)
+ && (node->conn->err != MONGO_BSON_NOT_FINISHED))
+ mongo_destroy (node->conn);
}
pthread_mutex_unlock (&node->lock);
/* free our resource as not to leak memory */
- bson_dispose (bson_record);
+ bson_destroy (bson_record); /* matches bson_init() */
+ bson_dealloc (bson_record); /* matches bson_alloc() */
return (0);
} /* }}} int wm_write */
if (node == NULL)
return;
- if (node->connected != 0)
- {
- mongo_destroy(node->conn);
- node->connected = 0;
- }
+ if (mongo_is_connected (node->conn))
+ mongo_destroy (node->conn);
sfree (node->host);
sfree (node);
if (node == NULL)
return (ENOMEM);
memset (node, 0, sizeof (*node));
+ mongo_init (node->conn);
node->host = NULL;
node->store_rates = 1;
pthread_mutex_init (&node->lock, /* attr = */ NULL);
status = cf_util_get_int (child, &node->timeout);
else if (strcasecmp ("StoreRates", child->key) == 0)
status = cf_util_get_boolean (child, &node->store_rates);
+ else if (strcasecmp ("Database", child->key) == 0)
+ status = cf_util_get_string (child, &node->db);
+ else if (strcasecmp ("User", child->key) == 0)
+ status = cf_util_get_string (child, &node->user);
+ else if (strcasecmp ("Password", child->key) == 0)
+ status = cf_util_get_string (child, &node->passwd);
else
WARNING ("write_mongodb plugin: Ignoring unknown config option \"%s\".",
child->key);
break;
} /* for (i = 0; i < ci->children_num; i++) */
+ if ((node->db != NULL) || (node->user != NULL) || (node->passwd != NULL))
+ {
+ if ((node->db == NULL) || (node->user == NULL) || (node->passwd == NULL))
+ {
+ WARNING ("write_mongodb plugin: Authentication requires the "
+ "\"Database\", \"User\" and \"Password\" options to be specified, "
+ "but at last one of them is missing. Authentication will NOT be "
+ "used.");
+ sfree (node->db);
+ sfree (node->user);
+ sfree (node->passwd);
+ }
+ }
+
if (status == 0)
{
char cb_name[DATA_MAX_NAME_LEN];