| Index: trunk/phase3/includes/User.php |
| — | — | @@ -248,7 +248,7 @@ |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | if ( !$data ) { |
| 252 | | - wfDebug( "Cache miss for user {$this->mId}\n" ); |
| | 252 | + wfDebug( "User: cache miss for user {$this->mId}\n" ); |
| 253 | 253 | # Load from DB |
| 254 | 254 | if ( !$this->loadFromDatabase() ) { |
| 255 | 255 | # Can't load from ID, user is anonymous |
| — | — | @@ -256,7 +256,7 @@ |
| 257 | 257 | } |
| 258 | 258 | $this->saveToCache(); |
| 259 | 259 | } else { |
| 260 | | - wfDebug( "Got user {$this->mId} from cache\n" ); |
| | 260 | + wfDebug( "User: got user {$this->mId} from cache\n" ); |
| 261 | 261 | # Restore from cache |
| 262 | 262 | foreach ( self::$mCacheVars as $name ) { |
| 263 | 263 | $this->$name = $data[$name]; |
| — | — | @@ -890,11 +890,11 @@ |
| 891 | 891 | |
| 892 | 892 | if ( ( $sName == $this->mName ) && $passwordCorrect ) { |
| 893 | 893 | $_SESSION['wsToken'] = $this->mToken; |
| 894 | | - wfDebug( "Logged in from $from\n" ); |
| | 894 | + wfDebug( "User: logged in from $from\n" ); |
| 895 | 895 | return true; |
| 896 | 896 | } else { |
| 897 | 897 | # Invalid credentials |
| 898 | | - wfDebug( "Can't log in from $from, invalid credentials\n" ); |
| | 898 | + wfDebug( "User: can't log in from $from, invalid credentials\n" ); |
| 899 | 899 | $this->loadDefaults(); |
| 900 | 900 | return false; |
| 901 | 901 | } |
| — | — | @@ -3617,12 +3617,12 @@ |
| 3618 | 3618 | |
| 3619 | 3619 | // Maybe load from the object |
| 3620 | 3620 | if ( !is_null( $this->mOptionOverrides ) ) { |
| 3621 | | - wfDebug( "Loading options for user " . $this->getId() . " from override cache.\n" ); |
| | 3621 | + wfDebug( "User: loading options for user " . $this->getId() . " from override cache.\n" ); |
| 3622 | 3622 | foreach( $this->mOptionOverrides as $key => $value ) { |
| 3623 | 3623 | $this->mOptions[$key] = $value; |
| 3624 | 3624 | } |
| 3625 | 3625 | } else { |
| 3626 | | - wfDebug( "Loading options for user " . $this->getId() . " from database.\n" ); |
| | 3626 | + wfDebug( "User: loading options for user " . $this->getId() . " from database.\n" ); |
| 3627 | 3627 | // Load from database |
| 3628 | 3628 | $dbr = wfGetDB( DB_SLAVE ); |
| 3629 | 3629 | |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -647,12 +647,12 @@ |
| 648 | 648 | $class = 'Database' . ucfirst( $type ); |
| 649 | 649 | |
| 650 | 650 | # Create object |
| 651 | | - wfDebug( "Connecting to $host $dbname...\n" ); |
| | 651 | + wfDebug( "Connecting to $host $dbname... " ); |
| 652 | 652 | $db = new $class( $host, $user, $password, $dbname, 1, $flags ); |
| 653 | 653 | if ( $db->isOpen() ) { |
| 654 | | - wfDebug( "Connected\n" ); |
| | 654 | + wfDebug( "Connected.\n" ); |
| 655 | 655 | } else { |
| 656 | | - wfDebug( "Failed\n" ); |
| | 656 | + wfDebug( "Failed.\n" ); |
| 657 | 657 | } |
| 658 | 658 | $db->setLBInfo( $server ); |
| 659 | 659 | if ( isset( $server['fakeSlaveLag'] ) ) { |