소스 검색

Removing database host
@TODO: cazzo, rimetterlo in qualche modo...

Paolo Libertini 6 년 전
부모
커밋
f0c35c00f6
4개의 변경된 파일7개의 추가작업 그리고 27개의 파일을 삭제
  1. 3 0
      lib/Mooses/AbstractMongo.php
  2. 2 14
      lib/Mooses/Mongodb/Mongo.php
  3. 1 7
      lib/Mooses/Mongodb/Mongo/Connection.php
  4. 1 6
      lib/Mooses/Mongodb/Mongo/Connection/Group.php

+ 3 - 0
lib/Mooses/AbstractMongo.php

@@ -4,6 +4,9 @@
  * Questa classe fa da interfaccia verso MongoDb
  *
  * @author Paolo Libertini <paolo.libertini@thinkopen.it>
+ * @method getCollection()
+ * @method addFieldToFilter($_attributeName, $_value)
+ * @method addFieldToSelect($_attributeName)
  */
 class Mooses_AbstractMongo extends Mooses_Mongodb_Mongo_Document {
     const ASC = "ASC";

+ 2 - 14
lib/Mooses/Mongodb/Mongo.php

@@ -297,13 +297,7 @@ class Mooses_Mongodb_Mongo {
         $connectionGroup = static::getConnectionGroup($connectionGroupName);
 
         if ($connectionGroupName == 'default' && count($connectionGroup->getMasters()) === 0) {
-            // Add a connection to localhost if no connections currently exist for the default connection group
-            $_iniConfig = Top::getConfig();
-            if(strlen($_iniConfig->mongodb->host) > 0){
-                $_connectionHost = $_iniConfig->mongodb->host;
-            } else {
-                $_connectionHost = "127.0.0.1";
-            }
+            $_connectionHost = "127.0.0.1";
             $connectionGroup->addMaster(new Mooses_Mongodb_Mongo_Connection($_connectionHost));
         }
 
@@ -325,13 +319,7 @@ class Mooses_Mongodb_Mongo {
         $connectionGroup = static::getConnectionGroup($connectionGroupName);
 
         if ($connectionGroupName == 'default' && count($connectionGroup->getSlaves()) === 0 && count($connectionGroup->getMasters()) === 0) {
-            // Add a connection to localhost if no connections currently exist for the default connection group
-            $_iniConfig = Top::getConfig();
-            if(strlen($_iniConfig->mongodb->host) > 0){
-                $_connectionHost = $_iniConfig->mongodb->host;
-            } else {
-                $_connectionHost = "127.0.0.1";
-            }
+            $_connectionHost = "127.0.0.1";
             $connectionGroup->addMaster(new Mooses_Mongodb_Mongo_Connection($_connectionHost));
         }
 

+ 1 - 7
lib/Mooses/Mongodb/Mongo/Connection.php

@@ -21,13 +21,7 @@ class Mooses_Mongodb_Mongo_Connection extends MongoClient
 	{
 		Mooses_Mongodb_Mongo::init();
 		
-		// Set the server to local host if one was not provided
-        $_iniConfig = Top::getConfig();
-        if(strlen($_iniConfig->mongodb->host) > 0){
-            $_connectionHost = $_iniConfig->mongodb->host;
-        } else {
-            $_connectionHost = "127.0.0.1";
-        }
+        $_connectionHost = "127.0.0.1";
 		if (is_null($connectionString)) $connectionString = $_connectionHost;
 
 		// Force mongo to connect only when we need to

+ 1 - 6
lib/Mooses/Mongodb/Mongo/Connection/Group.php

@@ -205,12 +205,7 @@ class Mooses_Mongodb_Mongo_Connection_Group
 			
 			$hostString .= '@';
 		}
-		$_iniConfig = Top::getConfig();
-		if(strlen($_iniConfig->mongodb->host) > 0){
-			$_connectionHost = $_iniConfig->mongodb->host;
-		} else {
-			$_connectionHost = "127.0.0.1";
-		}
+        $_connectionHost = "127.0.0.1";
 		// Set host
 		if (isset($hostOptions['host']) && !is_null($hostOptions['host'])) $hostString .= $hostOptions['host'];
 		else $hostString .= $_connectionHost;