Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prettify:

Browse source 
* set_timeout() -> setTimeout()
* remove a couple obsolete references from dump code
This commit is contained in:
Brion Vibber 2007-03-09 15:26:41 +00:00
parent 21f7b4bea5
commit 3caa998c8c
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/Database.php
View file

@ -1967,7 +1967,14 @@ class Database {
return $b;
}
function set_timeout($timeout) {
/**
* Override database's default connection timeout.
* May be useful for very long batch queries such as
* full-wiki dumps, where a single query reads out
* over hours or days.
* @param int $timeout in seconds
*/
public function setTimeout( $timeout ) {
$this->query( "SET net_read_timeout=$timeout" );
$this->query( "SET net_write_timeout=$timeout" );
}

3
includes/DatabasePostgres.php
View file

@ -937,7 +937,8 @@ class DatabasePostgres extends Database {
return array( $startOpts, $useIndex, $tailOpts );
}
function set_timeout($timeout) {
public function setTimeout( $timeout ) {
/// @fixme no-op
}
function ping() {

11
maintenance/backup.inc
View file

@ -174,7 +174,7 @@ class BackupDumper {
$this->initProgress( $history );
$db =& $this->backupDb();
$db = $this->backupDb();
$exporter = new WikiExporter( $db, $history, WikiExporter::STREAM, $text );
$wrapper = new ExportProgressFilter( $this->sink, $this );
@ -214,15 +214,18 @@ class BackupDumper {
$this->startTime = wfTime();
}
function &backupDb() {
function backupDb() {
global $wgDBadminuser, $wgDBadminpassword;
global $wgDBname, $wgDebugDumpSql, $wgDBtype;
$flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
$class = 'Database' . ucfirst($wgDBtype);
$db = new $class( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
$timeout = 3600 * 24;
$db->set_timeout($timeout);
// Discourage the server from disconnecting us if it takes a long time
// to read out the big ol' batch query.
$db->setTimeout( 3600 * 24 );
return $db;
}

2
maintenance/dumpTextPass.php
View file

@ -116,7 +116,7 @@ class TextPassDumper extends BackupDumper {
$this->initProgress( $this->history );
$this->db =& $this->backupDb();
$this->db = $this->backupDb();
$this->egress = new ExportProgressFilter( $this->sink, $this );