| Index: trunk/phase3/maintenance/dumpTextPass.php |
| — | — | @@ -181,6 +181,7 @@ |
| 182 | 182 | |
| 183 | 183 | if ( $this->reporting ) { |
| 184 | 184 | $now = wfTimestamp( TS_DB ); |
| | 185 | + $nowts = wfTime(); |
| 185 | 186 | $deltaAll = wfTime() - $this->startTime; |
| 186 | 187 | $deltaPart = wfTime() - $this->lastTime; |
| 187 | 188 | $this->pageCountPart = $this->pageCount - $this->pageCountLast; |
| — | — | @@ -221,7 +222,7 @@ |
| 222 | 223 | } |
| 223 | 224 | $this->progress( sprintf( "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), %d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% prefetched (all|curr), ETA %s [max %d]",- |
| 224 | 225 | $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) ); |
| 225 | | - $this->lastTime = $now; |
| | 226 | + $this->lastTime = $nowts; |
| 226 | 227 | $this->revCountLast = $this->revCount; |
| 227 | 228 | $this->prefetchCountLast = $this->prefetchCount; |
| 228 | 229 | $this->fetchCountLast = $this->fetchCount; |
| — | — | @@ -233,6 +234,10 @@ |
| 234 | 235 | } |
| 235 | 236 | |
| 236 | 237 | function checkIfTimeExceeded() { |
| | 238 | + $m1 = $this->maxTimeAllowed; |
| | 239 | + $m2 = $this->lastTime; |
| | 240 | + $m3 = $this->timeOfCheckpoint; |
| | 241 | + $m4 = $this->lastTime - $this->timeOfCheckpoint; |
| 237 | 242 | if ( $this->maxTimeAllowed && ( $this->lastTime - $this->timeOfCheckpoint > $this->maxTimeAllowed ) ) { |
| 238 | 243 | return True; |
| 239 | 244 | } |