From 769a37aecfa93be73eb673c2989c8582ad21818b Mon Sep 17 00:00:00 2001
From: Ross Singer <rossfsinger@gmail.com>
Date: Thu, 25 Jun 2015 21:36:03 +0100
Subject: [PATCH] Get rid of the socketTimeoutMS that's causing issues

---
 src/mongo/delegates/SearchDocuments.class.php |  6 ++----
 src/mongo/delegates/Tables.class.php          | 12 ++++--------
 src/mongo/delegates/Views.class.php           | 12 ++++--------
 src/mongo/util/IndexUtils.class.php           | 12 ++++--------
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/mongo/delegates/SearchDocuments.class.php b/src/mongo/delegates/SearchDocuments.class.php
index 3c14acec..aabf1ddb 100644
--- a/src/mongo/delegates/SearchDocuments.class.php
+++ b/src/mongo/delegates/SearchDocuments.class.php
@@ -117,8 +117,7 @@ public function generateSearchDocumentBasedOnSpecId($specId, $resource, $context
             ->ensureIndex(
                 array('_id.type'=>1),
                 array(
-                    'background'=>1,
-                    "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                    'background'=>1
                 )
             );
 
@@ -128,8 +127,7 @@ public function generateSearchDocumentBasedOnSpecId($specId, $resource, $context
             ->ensureIndex(
                 array('_impactIndex'=>1),
                 array(
-                    'background'=>1,
-                    "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                    'background'=>1
                 )
             );
 
diff --git a/src/mongo/delegates/Tables.class.php b/src/mongo/delegates/Tables.class.php
index 5a171438..aac0f43a 100644
--- a/src/mongo/delegates/Tables.class.php
+++ b/src/mongo/delegates/Tables.class.php
@@ -486,8 +486,7 @@ public function generateTableRows($tableType,$resource=null,$context=null,$queue
                 '_id.type'=>1
             ),
             array(
-                'background'=>1,
-                "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                'background'=>1
             )
         );
 
@@ -496,8 +495,7 @@ public function generateTableRows($tableType,$resource=null,$context=null,$queue
                 '_id.type'=>1
             ),
             array(
-                'background'=>1,
-                "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                'background'=>1
             )
         );
 
@@ -506,8 +504,7 @@ public function generateTableRows($tableType,$resource=null,$context=null,$queue
                 'value.'._IMPACT_INDEX=>1
             ),
             array(
-                'background'=>1,
-                "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                'background'=>1
             )
         );
 
@@ -519,8 +516,7 @@ public function generateTableRows($tableType,$resource=null,$context=null,$queue
                 $collection->ensureIndex(
                     $ensureIndex,
                     array(
-                        'background'=>1,
-                        "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                        'background'=>1
                     )
                 );
             }
diff --git a/src/mongo/delegates/Views.class.php b/src/mongo/delegates/Views.class.php
index 04e4d6f1..d5678140 100644
--- a/src/mongo/delegates/Views.class.php
+++ b/src/mongo/delegates/Views.class.php
@@ -410,8 +410,7 @@ public function generateView($viewId,$resource=null,$context=null,$queueName=nul
                     '_id.type'=>1
                 ),
                 array(
-                    'background'=>1,
-                    "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                    'background'=>1
                 )
             );
 
@@ -420,8 +419,7 @@ public function generateView($viewId,$resource=null,$context=null,$queueName=nul
                     '_id.type'=>1
                 ),
                 array(
-                    'background'=>1,
-                    "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                    'background'=>1
                 )
             );
 
@@ -430,8 +428,7 @@ public function generateView($viewId,$resource=null,$context=null,$queueName=nul
                     'value.'._IMPACT_INDEX=>1
                 ),
                 array(
-                    'background'=>1,
-                    "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                    'background'=>1
                 )
             );
 
@@ -443,8 +440,7 @@ public function generateView($viewId,$resource=null,$context=null,$queueName=nul
                     $collection->ensureIndex(
                         $ensureIndex,
                         array(
-                            'background'=>1,
-                            "socketTimeoutMS"=>\Tripod\Mongo\Config::getInstance()->getMongoCursorTimeout()
+                            'background'=>1
                         )
                     );
                 }
diff --git a/src/mongo/util/IndexUtils.class.php b/src/mongo/util/IndexUtils.class.php
index 1371ddd4..b1ec3cf8 100644
--- a/src/mongo/util/IndexUtils.class.php
+++ b/src/mongo/util/IndexUtils.class.php
@@ -44,8 +44,7 @@ public function ensureIndexes($reindex=false,$storeName=null,$background=true)
                             ->ensureIndex(
                                 $fields,
                                 array(
-                                    "background"=>$background,
-                                    "socketTimeoutMS"=>Config::getInstance()->getMongoCursorTimeout()
+                                    "background"=>$background
                                 )
                             );
                     }
@@ -56,8 +55,7 @@ public function ensureIndexes($reindex=false,$storeName=null,$background=true)
                                 $fields,
                                 array(
                                     'name'=>$indexName,
-                                    "background"=>$background,
-                                    "socketTimeoutMS"=>Config::getInstance()->getMongoCursorTimeout()
+                                    "background"=>$background
                                 )
                             );
                     }
@@ -84,8 +82,7 @@ public function ensureIndexes($reindex=false,$storeName=null,$background=true)
                         $collection->ensureIndex(
                             $index,
                             array(
-                                "background"=>$background,
-                                "socketTimeoutMS"=>Config::getInstance()->getMongoCursorTimeout()
+                                "background"=>$background
                             )
                         );
                     }
@@ -112,8 +109,7 @@ public function ensureIndexes($reindex=false,$storeName=null,$background=true)
                         $collection->ensureIndex(
                             $index,
                             array(
-                                "background"=>$background,
-                                "socketTimeoutMS"=>Config::getInstance()->getMongoCursorTimeout()
+                                "background"=>$background
                             )
                         );
                     }