Skip to content

F
freeswitch
提交 98bba8b5 authored 作者: Chris Rienzo's avatar Chris Rienzo
浏览文件
操作

mod_mongo: switched from C++ to latest C driver

上级 c7bd862e
隐藏空白字符变更
内嵌 并排
正在显示 包含 403 行增加 和 37 行删除
src/mod/applications/mod_mongo/Makefile.am
浏览文件 @ 98bba8b5
include $(top_srcdir)/build/modmake.rulesam
AUTOMAKE_OPTIONS += foreign
MODNAME=mod_mongo
MONGO_CXX_DRIVER_VERSION=v2.4
MONGO_CXX_DRIVER_URL=http://downloads.mongodb.org/cxx-driver
MONGO_CXX_DRIVER_TARBALL=mongodb-linux-x86_64-$(MONGO_CXX_DRIVER_VERSION)-latest.tgz
MONGO_CXX_DRIVER_SRC=$(switch_builddir)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION)
LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a
MONGOC=mongo-c-driver-0.92.2
MONGOC_DIR=$(switch_srcdir)/libs/$(MONGOC)
MONGOC_BUILDDIR=$(switch_builddir)/libs/$(MONGOC)
MONGOC_LA=$(MONGOC_BUILDDIR)/libmongoc-priv.la
mod_LTLIBRARIES = mod_mongo.la
mod_mongo_la_SOURCES = mod_mongo.cpp
mod_mongo_la_CFLAGS = $(AM_CFLAGS)
mod_mongo_la_CPPFLAGS = -I$(MONGO_CXX_DRIVER_SRC)/src -I$(switch_srcdir)/libs/libteletone/src/
mod_mongo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LIBMONGOCLIENT_A)
mod_mongo_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lboost_thread -lboost_filesystem-mt -lboost_system-mt
mod_mongo_la_SOURCES = mod_mongo.c
mod_mongo_la_CFLAGS = $(AM_CFLAGS) -I$(MONGOC_DIR)/src/mongoc/ -I$(MONGOC_DIR)/src/libbson/src/bson/
mod_mongo_la_CPPFLAGS = $(AM_CPPFLAGS)
mod_mongo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(MONGOC_LA)
mod_mongo_la_LDFLAGS = -avoid-version -module -no-undefined -shared
BUILT_SOURCES=$(LIBMONGOCLIENT_A)
BUILT_SOURCES=$(MONGOC_LA)
$(MONGO_CXX_DRIVER_SRC):
$(GETLIB) $(MONGO_CXX_DRIVER_URL) $(MONGO_CXX_DRIVER_TARBALL)
cd $(MONGO_CXX_DRIVER_SRC) && patch -p0 -i $(switch_srcdir)/src/mod/applications/mod_mongo/fpic_hack.diff
$(MONGOC_DIR)/configure:
$(GETLIB) $(MONGOC).tar.gz
sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/configure
sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/build/autotools/SetupLibtool.m4
sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/src/libbson/configure
sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/src/libbson/build/autotools/SetupLibtool.m4
cd $(MONGOC_DIR) && autoreconf -i
$(TOUCH_TARGET)
$(MONGOC_BUILDDIR)/Makefile: $(MONGOC_DIR)/configure
mkdir -p $(MONGOC_BUILDDIR)
cd $(MONGOC_BUILDDIR) && $(DEFAULT_VARS) $(MONGOC_DIR)/configure $(DEFAULT_ARGS)
$(TOUCH_TARGET)
$(LIBMONGOCLIENT_A): $(MONGO_CXX_DRIVER_SRC)
(cd $(MONGO_CXX_DRIVER_SRC) && \
sed -i'' SConstruct -e "s|Environment()|Environment(ENV = {'PATH' : os.environ.get('PATH','/bin:/usr/bin'),'CFLAGS' : os.environ.get('CFLAGS',''),'CXXFLAGS' : os.environ.get('CXXFLAGS','')})|" && \
echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \
scons)
$(MONGOC_LA): $(MONGOC_BUILDDIR)/Makefile
cd $(MONGOC_BUILDDIR) && $(MAKE)
$(TOUCH_TARGET)
src/mod/applications/mod_mongo/conf/autoload_configs/mongo.conf.xml
浏览文件 @ 98bba8b5
......@@ -2,14 +2,9 @@
<settings>
<!--
connection-string handles different ways to connect to mongo
samples:
server:port
foo/server:port,server:port SET
mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
-->
<param name="connection-string" value="127.0.0.1:27017"/>
<param name="max-connections" value="100"/>
<!-- Timeout in seconds. 0 means no timeout -->
<param name="socket-timeout" value="0"/>
<param name="connection-string" value="mongodb://127.0.0.1:27017/?connectTimeoutMS=5000"/>
<!--
<param name="map" value="function() { emit(this.a, 1); }"/>
......
src/mod/applications/mod_mongo/fpic_hack.diff deleted 100644 → 0
浏览文件 @ c7bd862e
--- SConstruct 2013-10-30 17:18:51.160645496 -0400
+++ new 2013-10-30 17:22:18.790072856 -0400
@@ -78,7 +78,7 @@
env['DIST_ARCHIVE_SUFFIX'] = '.tgz'
if nix:
- env.Append(CCFLAGS=["-O3", "-pthread"])
+ env.Append(CCFLAGS=["-I../pcre", "-fPIC", "-O3", "-pthread"])
if linux:
env.Append(LINKFLAGS=["-pthread"])
src/mod/applications/mod_mongo/mod_mongo.cpp → src/mod/applications/mod_mongo/mod_mongo.c
浏览文件 @ 98bba8b5
/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2005-2013, Anthony Minessale II <anthm@freeswitch.org>
* Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
*
* Version: MPL 1.1
*
......@@ -26,158 +26,240 @@
* Tamas Cseke <cstomi.levlist@gmail.com>
* Christopher Rienzo <crienzo@grasshopper.com>
*
* mod_mongo.cpp -- API for MongoDB
* mod_mongo.c -- API for MongoDB
*
*/
#include <switch.h>
#include <mongo/client/dbclient.h>
using namespace mongo;
#ifndef MAX
/* libbson will define MIN/MAX in a way that won't compile in FS */
#define MAX(a,b) (((a)>(b))?(a):(b))
#define MIN(a,b) (((a)<(b))?(a):(b))
#include <mongoc.h>
#undef MAX
#undef MIN
#else
#include <mongoc.h>
#endif
#define DELIMITER ';'
#define FIND_ONE_SYNTAX "mongo_find_one ns; query; fields; options"
#define MAPREDUCE_SYNTAX "mongo_mapreduce ns; query"
SWITCH_MODULE_LOAD_FUNCTION(mod_mongo_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mongo_shutdown);
SWITCH_MODULE_DEFINITION(mod_mongo, mod_mongo_load, mod_mongo_shutdown, NULL);
static struct {
const char *map;
const char *reduce;
const char *finalize;
const char *conn_str;
double socket_timeout;
mongoc_uri_t *uri;
mongoc_client_pool_t *client_pool;
} globals;
/**
* @param query_options_str
* @return query options
*/
static int parse_query_options(char *query_options_str)
{
int query_options = 0;
int query_options = MONGOC_QUERY_NONE;
if (strstr(query_options_str, "cursorTailable")) {
query_options |= QueryOption_CursorTailable;
query_options |= MONGOC_QUERY_TAILABLE_CURSOR;
}
if (strstr(query_options_str, "slaveOk")) {
query_options |= QueryOption_SlaveOk;
query_options |= MONGOC_QUERY_SLAVE_OK;
}
if (strstr(query_options_str, "oplogReplay")) {
query_options |= QueryOption_OplogReplay;
query_options |= MONGOC_QUERY_OPLOG_REPLAY;
}
if (strstr(query_options_str, "noCursorTimeout")) {
query_options |= QueryOption_NoCursorTimeout;
query_options |= MONGOC_QUERY_NO_CURSOR_TIMEOUT;
}
if (strstr(query_options_str, "awaitData")) {
query_options |= QueryOption_AwaitData;
query_options |= MONGOC_QUERY_AWAIT_DATA;
}
if (strstr(query_options_str, "exhaust")) {
query_options |= QueryOption_Exhaust;
query_options |= MONGOC_QUERY_EXHAUST;
}
if (strstr(query_options_str, "partialResults")) {
query_options |= QueryOption_PartialResults;
query_options |= MONGOC_QUERY_PARTIAL;
}
return query_options;
}
/**
* @return a new connection to mongodb or NULL if error
*/
static mongoc_client_t *get_connection(void)
{
mongoc_client_t *client = mongoc_client_pool_pop(globals.client_pool);
if (!client) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to get connection to: %s\n", globals.conn_str);
return NULL;
}
/* TODO auth */
return client;
}
/**
* Mark connection as finished
*/
static void connection_done(mongoc_client_t *conn)
{
mongoc_client_pool_push(globals.client_pool, conn);
}
SWITCH_STANDARD_API(mongo_mapreduce_function)
{
switch_status_t status = SWITCH_STATUS_SUCCESS;
DBClientBase *conn = NULL;
char *ns = NULL, *json_query = NULL;
char *db = NULL, *collection = NULL, *json_query = NULL;
ns = strdup(cmd);
switch_assert(ns != NULL);
db = strdup(cmd);
switch_assert(db != NULL);
if ((json_query = strchr(ns, DELIMITER))) {
*json_query++ = '\0';
if ((collection = strchr(db, '.'))) {
*collection++ = '\0';
if ((json_query = strchr(collection, DELIMITER))) {
*json_query++ = '\0';
}
}
if (!zstr(ns) && !zstr(json_query)) {
try {
scoped_ptr<ScopedDbConnection> conn(ScopedDbConnection::getScopedDbConnection(string(globals.conn_str, globals.socket_timeout)));
BSONObj query = fromjson(json_query);
BSONObj out;
BSONObjBuilder cmd;
if (!zstr(db) && !zstr(collection) && !zstr(json_query)) {
mongoc_client_t *conn = get_connection();
if (conn) {
bson_error_t error;
bson_t *query = bson_new_from_json((uint8_t *)json_query, strlen(json_query), &error);
if (query) {
bson_t out;
bson_t cmd;
bson_t child;
/* build command to send to mongodb */
bson_init(&cmd);
BSON_APPEND_UTF8(&cmd, "mapreduce", collection);
if (!zstr(globals.map)) {
BSON_APPEND_CODE(&cmd, "map", globals.map);
}
if (!zstr(globals.reduce)) {
BSON_APPEND_CODE(&cmd, "reduce", globals.reduce);
}
if (!zstr(globals.finalize)) {
BSON_APPEND_CODE(&cmd, "finalize", globals.finalize);
}
if (!bson_empty(query)) {
BSON_APPEND_DOCUMENT(&cmd, "query", query);
}
bson_append_document_begin(&cmd, "out", strlen("out"), &child);
BSON_APPEND_INT32(&child, "inline", 1);
bson_append_document_end(&cmd, &child);
/* send command and get result */
if (mongoc_client_command_simple(conn, db, &cmd, NULL /* read prefs */, &out, &error)) {
char *json_result = bson_as_json(&out, NULL);
stream->write_function(stream, "-OK\n%s\n", json_result);
bson_free(json_result);
} else {
stream->write_function(stream, "-ERR\nmongo_run_command failed!\n");
}
cmd.append("mapreduce", nsGetCollection(ns));
if (!zstr(globals.map)) {
cmd.appendCode("map", globals.map);
bson_destroy(query);
bson_destroy(&cmd);
bson_destroy(&out);
} else {
stream->write_function(stream, "-ERR\nfailed to parse query!\n");
}
if (!zstr(globals.reduce)) {
cmd.appendCode("reduce", globals.reduce);
}
if (!zstr(globals.finalize)) {
cmd.appendCode("finalize", globals.finalize);
}
if(!query.isEmpty()) {
cmd.append("query", query);
}
cmd.append("out", BSON("inline" << 1));
try {
conn->get()->runCommand(nsGetDB(ns), cmd.done(), out);
stream->write_function(stream, "-OK\n%s\n", out.jsonString().c_str());
} catch (DBException &e) {
stream->write_function(stream, "-ERR\n%s\n", e.toString().c_str());
} catch (...) {
stream->write_function(stream, "-ERR\nUnknown exception!\n");
}
conn->done();
} catch (DBException &e) {
stream->write_function(stream, "-ERR\n%s\n", e.toString().c_str());
} catch (...) {
stream->write_function(stream, "-ERR\nUnknown exception!\n");
connection_done(conn);
} else {
stream->write_function(stream, "-ERR\nfailed to get connection!\n");
}
} else {
stream->write_function(stream, "-ERR\n%s\n", MAPREDUCE_SYNTAX);
stream->write_function(stream, "-ERR\n%s\n", MAPREDUCE_SYNTAX);
}
switch_safe_free(ns);
switch_safe_free(db);
return status;
}
SWITCH_STANDARD_API(mongo_find_one_function)
SWITCH_STANDARD_API(mongo_find_one_function)
{
switch_status_t status = SWITCH_STATUS_SUCCESS;
char *ns = NULL, *json_query = NULL, *json_fields = NULL, *query_options_str = NULL;
char *db = NULL, *collection = NULL, *json_query = NULL, *json_fields = NULL, *query_options_str = NULL;
int query_options = 0;
ns = strdup(cmd);
switch_assert(ns != NULL);
if ((json_query = strchr(ns, DELIMITER))) {
*json_query++ = '\0';
if ((json_fields = strchr(json_query, DELIMITER))) {
*json_fields++ = '\0';
if ((query_options_str = strchr(json_fields, DELIMITER))) {
*query_options_str++ = '\0';
if (!zstr(query_options_str)) {
query_options = parse_query_options(query_options_str);
db = strdup(cmd);
switch_assert(db != NULL);
if ((collection = strchr(db, '.'))) {
*collection++ = '\0';
if ((json_query = strchr(collection, DELIMITER))) {
*json_query++ = '\0';
if ((json_fields = strchr(json_query, DELIMITER))) {
*json_fields++ = '\0';
if ((query_options_str = strchr(json_fields, DELIMITER))) {
*query_options_str++ = '\0';
if (!zstr(query_options_str)) {
query_options = parse_query_options(query_options_str);
}
}
}
}
}
if (!zstr(ns) && !zstr(json_query) && !zstr(json_fields)) {
try {
scoped_ptr<ScopedDbConnection> conn(ScopedDbConnection::getScopedDbConnection(string(globals.conn_str), globals.socket_timeout));
BSONObj query = fromjson(json_query);
BSONObj fields = fromjson(json_fields);
try {
BSONObj res = conn->get()->findOne(ns, Query(query), &fields, query_options);
stream->write_function(stream, "-OK\n%s\n", res.jsonString().c_str());
} catch (DBException &e) {
stream->write_function(stream, "-ERR\n%s\n", e.toString().c_str());
} catch (...) {
stream->write_function(stream, "-ERR\nUnknown exception!\n");
if (!zstr(db) && !zstr(collection) && !zstr(json_query) && !zstr(json_fields)) {
bson_error_t error;
mongoc_client_t *conn = get_connection();
if (conn) {
mongoc_collection_t *col = mongoc_client_get_collection(conn, db, collection);
if (col) {
bson_t *query = bson_new_from_json((uint8_t *)json_query, strlen(json_query), &error);
bson_t *fields = bson_new_from_json((uint8_t *)json_fields, strlen(json_fields), &error);
if (query && fields) {
int ok = 0;
/* send query */
mongoc_cursor_t *cursor = mongoc_collection_find(col, query_options, 0, 1, 0, query, fields, NULL);
if (cursor && mongoc_cursor_more(cursor) && !mongoc_cursor_error(cursor, &error)) {
/* get result from cursor */
const bson_t *result;
if (mongoc_cursor_next(cursor, &result)) {
char *json_result;
json_result = bson_as_json(result, NULL);
stream->write_function(stream, "-OK\n%s\n", json_result);
bson_free(json_result);
ok = 1;
}
}
if (!ok) {
stream->write_function(stream, "-ERR\nquery failed!\n");
}
if (cursor) {
mongoc_cursor_destroy(cursor);
}
} else {
stream->write_function(stream, "-ERR\nmissing query or fields!\n%s\n", FIND_ONE_SYNTAX);
}
if (query) {
bson_destroy(query);
}
if (fields) {
bson_destroy(fields);
}
mongoc_collection_destroy(col);
} else {
stream->write_function(stream, "-ERR\nunknown collection: %s\n", collection);
}
conn->done();
} catch (DBException &e) {
stream->write_function(stream, "-ERR\n%s\n", e.toString().c_str());
} catch (...) {
stream->write_function(stream, "-ERR\nUnknown exception!\n");
connection_done(conn);
} else {
stream->write_function(stream, "-ERR\nfailed to get connection!\n");
}
} else {
stream->write_function(stream, "-ERR\n%s\n", FIND_ONE_SYNTAX);
stream->write_function(stream, "-ERR\n%s\n", FIND_ONE_SYNTAX);
}
switch_safe_free(ns);
switch_safe_free(db);
return status;
}
......@@ -193,7 +275,8 @@ static switch_status_t config(switch_memory_pool_t *pool)
globals.reduce = "";
globals.finalize = "";
globals.conn_str = "";
globals.socket_timeout = 0.0;
globals.uri = NULL;
globals.client_pool = NULL;
if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
......@@ -207,24 +290,23 @@ static switch_status_t config(switch_memory_pool_t *pool)
if (!strcmp(var, "connection-string")) {
if (zstr(val)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "missing connection-string value\n");
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "missing connection-string\n");
status = SWITCH_STATUS_GENERR;
goto done;
} else {
try {
string errmsg;
ConnectionString cs = ConnectionString::parse(string(val), errmsg);
if (!cs.isValid()) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "connection-string \"%s\" is not valid: %s\n", val, errmsg.c_str());
globals.conn_str = switch_core_strdup(pool, val);
globals.uri = mongoc_uri_new(globals.conn_str);
if (globals.uri) {
globals.client_pool = mongoc_client_pool_new(globals.uri);
if (!globals.client_pool) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to pool for connection-string: %s\n", globals.conn_str);
status = SWITCH_STATUS_GENERR;
} else {
globals.conn_str = switch_core_strdup(pool, val);
goto done;
}
} catch (DBException &e) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "connection-string \"%s\" is not valid: %s\n", val, e.toString().c_str());
status = SWITCH_STATUS_GENERR;
} catch (...) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "connection-string \"%s\" is not valid\n", val);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid connection-string: %s\n", globals.conn_str);
status = SWITCH_STATUS_GENERR;
goto done;
}
}
} else if (!strcmp(var, "map")) {
......@@ -239,53 +321,24 @@ static switch_status_t config(switch_memory_pool_t *pool)
if (!zstr(val)) {
globals.finalize = switch_core_strdup(pool, val);
}
} else if (!strcmp(var, "socket-timeout")) {
if (!zstr(val)) {
if (switch_is_number(val)) {
double timeout = atof(val);
if (timeout >= 0.0) {
globals.socket_timeout = timeout;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "socket-timeout \"%s\" is not valid\n", val);
}
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "socket-timeout \"%s\" is not valid\n", val);
}
}
} else if (!strcmp(var, "max-connections")) {
if (!zstr(val)) {
if (switch_is_number(val)) {
int max_connections = atoi(val);
if (max_connections > 0) {
PoolForHost::setMaxPerHost(max_connections);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "max-connections \"%s\" is not valid\n", val);
}
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "max-connections \"%s\" is not valid\n", val);
}
}
}
}
}
if (!globals.client_pool) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No mongodb connection pool configured! Make sure connection-string is set\n");
status = SWITCH_STATUS_GENERR;
}
done:
switch_xml_free(xml);
return status;
}
SWITCH_BEGIN_EXTERN_C
SWITCH_MODULE_LOAD_FUNCTION(mod_mongo_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mongo_shutdown);
SWITCH_MODULE_DEFINITION(mod_mongo, mod_mongo_load, mod_mongo_shutdown, NULL);
SWITCH_MODULE_LOAD_FUNCTION(mod_mongo_load)
{
switch_api_interface_t *api_interface;
switch_application_interface_t *app_interface;
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
......@@ -303,12 +356,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_mongo_load)
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mongo_shutdown)
{
ScopedDbConnection::clearPool();
if (globals.client_pool) {
mongoc_client_pool_destroy(globals.client_pool);
globals.client_pool = NULL;
}
return SWITCH_STATUS_SUCCESS;
}
SWITCH_END_EXTERN_C
/* For Emacs:
* Local Variables:
* mode:c
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论