retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-5931 --resolve mod_mongo: update driver to v2.4

This commit is contained in:
Chris Rienzo 2013-11-04 14:29:48 -05:00
parent 381caad87f
commit 384ddf1517
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_mongo/Makefile
View File

@ -1,6 +1,6 @@
BASE=../../../.. BASE=../../../..
MONGO_CXX_DRIVER_VERSION=v1.8 MONGO_CXX_DRIVER_VERSION=v2.4
MONGO_CXX_DRIVER_URL=http://downloads.mongodb.org/cxx-driver 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_TARBALL=mongodb-linux-x86_64-$(MONGO_CXX_DRIVER_VERSION)-latest.tgz
MONGO_CXX_DRIVER_SRC=$(BASE)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION) MONGO_CXX_DRIVER_SRC=$(BASE)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION)
@ -9,7 +9,7 @@ LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a
LOCAL_SOURCES=mongo_conn.cpp LOCAL_SOURCES=mongo_conn.cpp
LOCAL_OBJS=mongo_conn.o LOCAL_OBJS=mongo_conn.o
LOCAL_CFLAGS=-I$(MONGO_CXX_DRIVER_SRC)/mongo LOCAL_CFLAGS=-I$(MONGO_CXX_DRIVER_SRC)/src
LOCAL_LIBADD=$(LIBMONGOCLIENT_A) LOCAL_LIBADD=$(LIBMONGOCLIENT_A)
LOCAL_LDFLAGS=-lboost_thread -lboost_filesystem-mt -lboost_system-mt LOCAL_LDFLAGS=-lboost_thread -lboost_filesystem-mt -lboost_system-mt
MODDIR=$(shell pwd) MODDIR=$(shell pwd)

16
src/mod/applications/mod_mongo/fpic_hack.diff
View File

@ -1,11 +1,11 @@
--- SConstruct.orig 2011-04-28 19:00:36.000000000 +0200 --- SConstruct 2013-10-30 17:18:51.160645496 -0400
+++ SConstruct 2011-04-28 19:01:19.000000000 +0200 +++ new 2013-10-30 17:22:18.790072856 -0400
@@ -45,7 +45,7 @@ @@ -78,7 +78,7 @@
linux = True env['DIST_ARCHIVE_SUFFIX'] = '.tgz'
if nix: if nix:
- env.Append( CPPFLAGS=" -O3" ) - env.Append(CCFLAGS=["-O3", "-pthread"])
+ env.Append( CPPFLAGS=" -I../pcre -fPIC -O3" ) + env.Append(CCFLAGS=["-I../pcre", "-fPIC", "-O3", "-pthread"])
env.Append( LIBS=["pthread"] )
if linux: if linux:
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) env.Append(LINKFLAGS=["-pthread"])

4
src/mod/applications/mod_mongo/mod_mongo.cpp
View File

@ -62,7 +62,7 @@ SWITCH_STANDARD_API(mongo_mapreduce_function)
BSONObj out; BSONObj out;
BSONObjBuilder cmd; BSONObjBuilder cmd;
cmd.append("mapreduce", conn->nsGetCollection(ns)); cmd.append("mapreduce", nsGetCollection(ns));
if (!zstr(globals.map)) { if (!zstr(globals.map)) {
cmd.appendCode("map", globals.map); cmd.appendCode("map", globals.map);
} }
@ -79,7 +79,7 @@ SWITCH_STANDARD_API(mongo_mapreduce_function)
conn = mongo_connection_pool_get(globals.conn_pool); conn = mongo_connection_pool_get(globals.conn_pool);
if (conn) { if (conn) {
conn->runCommand(conn->nsGetDB(ns), cmd.done(), out); conn->runCommand(nsGetDB(ns), cmd.done(), out);
mongo_connection_pool_put(globals.conn_pool, conn, SWITCH_FALSE); mongo_connection_pool_put(globals.conn_pool, conn, SWITCH_FALSE);
stream->write_function(stream, "-OK\n%s\n", out.jsonString().c_str()); stream->write_function(stream, "-OK\n%s\n", out.jsonString().c_str());

5
src/mod/applications/mod_mongo/mod_mongo.h
View File

@ -32,10 +32,7 @@
#ifndef MOD_MONGO_H #ifndef MOD_MONGO_H
#define MOD_MONGO_H #define MOD_MONGO_H
#include <client/dbclient.h> #include <mongo/client/dbclient.h>
#include <client/connpool.h>
#include <db/json.h>
#include <bson/bson.h>
using namespace mongo; using namespace mongo;