FS-7346 #resolve #comment update mod_mongo driver to 1.1.0

diff --git a/conf/vanilla/autoload_configs/mongo.conf.xml b/conf/vanilla/autoload_configs/mongo.conf.xml
index 72fffafbb79ae78d706ede0815a945b3e0bddbc1..5adf148e7d134ba594e77b68d47e933745142e58 100644 (file)
--- a/conf/vanilla/autoload_configs/mongo.conf.xml
+++ b/conf/vanilla/autoload_configs/mongo.conf.xml
@@ -1,15 +1,9 @@
 <configuration name="mongo.conf">
   <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=10000"/>
 
 <!--
     <param name="map" value="function() { emit(this.a, 1); }"/>

diff --git a/freeswitch.spec b/freeswitch.spec
index a24d1ff45d2355e3691e9890d562e5bb71bf789f..6981ae3f58513dee34a9fd2c9f5747c736fe2f89 100644 (file)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -129,7 +129,7 @@ Source10:   http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
 Source11:       http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz
 Source12:       http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz
 Source13:       http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
-Source14:       http://files.freeswitch.org/downloads/libs/mongo-c-driver-0.92.2.tar.gz
+Source14:       http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz
 Prefix:                %{prefix}
 
 

diff --git a/src/mod/applications/mod_mongo/Makefile.am b/src/mod/applications/mod_mongo/Makefile.am
index 8b37d59da78500a9cd14b5e632027bdf098700c8..2249d5613bad1c5b450c69753069c9b631583142 100644 (file)
--- a/src/mod/applications/mod_mongo/Makefile.am
+++ b/src/mod/applications/mod_mongo/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/build/modmake.rulesam
 AUTOMAKE_OPTIONS += foreign
 MODNAME=mod_mongo
 
-MONGOC=mongo-c-driver-0.92.2
+MONGOC=mongo-c-driver-1.1.0
 MONGOC_DIR=$(switch_srcdir)/libs/$(MONGOC)
 MONGOC_BUILDDIR=$(switch_builddir)/libs/$(MONGOC)
 MONGOC_LA=$(MONGOC_BUILDDIR)/libmongoc-priv.la