Some protection move log cleanup (bug 15754)

[lhc/web/wiklou.git] / includes / ExternalStoreDB.php

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index 84d44a4..9fa7d1b 100644 (file)
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -34,16 +34,13 @@ class ExternalStoreDB {
        /** @todo Document.*/
        function &getSlave( $cluster ) {
                $lb =& $this->getLoadBalancer( $cluster );
-               // Make only two connection attempts, since we still have the master to try
-               return $lb->getConnection( DB_SLAVE, array(), false, 2 );
+               return $lb->getConnection( DB_SLAVE );
        }
 
        /** @todo Document.*/
-       function &getMaster( $cluster, $retry = true ) {
+       function &getMaster( $cluster ) {
                $lb =& $this->getLoadBalancer( $cluster );
-               // Make only two connection attempts if there are other clusters to try
-               $attempts = $retry ? false : 2;
-               return $lb->getConnection( DB_MASTER, array(), false, $attempts, LoadBalancer::GRACEFUL );
+               return $lb->getConnection( DB_MASTER );
        }
 
        /** @todo Document.*/
@@ -122,13 +119,10 @@ class ExternalStoreDB {
         *
         * @param $cluster String: the cluster name
         * @param $data String: the data item
-        * @param $retry bool: allows an extra DB connection retry after 1 second
         * @return string URL
         */
-       function store( $cluster, $data, $retry = true ) {
-               if( !$dbw = $this->getMaster( $cluster, $retry ) ) {
-                       return false; // failed, maybe another cluster is up...
-               }
+       function store( $cluster, $data ) {
+               $dbw = $this->getMaster( $cluster );
                $id = $dbw->nextSequenceValue( 'blob_blob_id_seq' );
                $dbw->insert( $this->getTable( $dbw ), 
                        array( 'blob_id' => $id, 'blob_text' => $data ),