| Index: branches/wmf-deployment/includes/GlobalFunctions.php |
| — | — | @@ -3164,11 +3164,12 @@ |
| 3165 | 3165 | * to use this outside maintenance scripts in its present form. |
| 3166 | 3166 | * |
| 3167 | 3167 | * @param $maxLag Integer |
| | 3168 | + * @param $wiki mixed Wiki identifier accepted by wfGetLB |
| 3168 | 3169 | * @return null |
| 3169 | 3170 | */ |
| 3170 | | -function wfWaitForSlaves( $maxLag ) { |
| | 3171 | +function wfWaitForSlaves( $maxLag, $wiki = false ) { |
| 3171 | 3172 | if( $maxLag ) { |
| 3172 | | - $lb = wfGetLB(); |
| | 3173 | + $lb = wfGetLB( $wiki ); |
| 3173 | 3174 | list( $host, $lag ) = $lb->getMaxLag(); |
| 3174 | 3175 | while( $lag > $maxLag ) { |
| 3175 | 3176 | $name = @gethostbyaddr( $host ); |
| Property changes on: branches/wmf-deployment/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3176 | 3177 | + /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646 |
| /branches/wmf-deployment/includes/GlobalFunctions.php:53381 |
| /trunk/phase3/includes/GlobalFunctions.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58814,58816 |