47a1619027
A terminating line break has not been required in wfDebug() since 2014, however no migration was done. Some of these line breaks found their way into LoggerInterface::debug() calls, where they mess up the formatting of the debug log. So, remove terminating line breaks from wfDebug() and LoggerInterface::debug() calls. Also: * Fix the stripping of leading line breaks from the log header emitted by Setup.php. This feature, accidentally broken in 2014, allows requests to be distinguished in the log file. * Avoid using the global variable $self. * Move the logging of the client IP back to Setup.php. It was moved to WebRequest in the hopes that it would not always be needed, however $wgRequest->getIP() is now called unconditionally a few lines up in Setup.php. This means that it is put in its proper place after the "start request" message. * Wrap the log header code in a closure so that variables like $name do not leak into global scope. * In Linker.php, remove a few instances of an unnecessary second parameter to wfDebug(). Change-Id: I96651d3044a95b9d210b51cb8368edc76bebbb9e
96 lines
2.5 KiB
PHP
96 lines
2.5 KiB
PHP
<?php
|
|
/**
|
|
* Data caching with dependencies.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
* @file
|
|
* @ingroup Cache
|
|
*/
|
|
|
|
/**
|
|
* @ingroup Cache
|
|
*/
|
|
class FileDependency extends CacheDependency {
|
|
private $filename;
|
|
private $timestamp;
|
|
|
|
/**
|
|
* Create a file dependency
|
|
*
|
|
* @param string $filename The name of the file, preferably fully qualified
|
|
* @param null|bool|int $timestamp The unix last modified timestamp, or false if the
|
|
* file does not exist. If omitted, the timestamp will be loaded from
|
|
* the file.
|
|
*
|
|
* A dependency on a nonexistent file will be triggered when the file is
|
|
* created. A dependency on an existing file will be triggered when the
|
|
* file is changed.
|
|
*/
|
|
public function __construct( $filename, $timestamp = null ) {
|
|
$this->filename = $filename;
|
|
$this->timestamp = $timestamp;
|
|
}
|
|
|
|
/**
|
|
* @return array
|
|
*/
|
|
public function __sleep() {
|
|
$this->loadDependencyValues();
|
|
|
|
return [ 'filename', 'timestamp' ];
|
|
}
|
|
|
|
public function loadDependencyValues() {
|
|
if ( $this->timestamp === null ) {
|
|
Wikimedia\suppressWarnings();
|
|
# Dependency on a non-existent file stores "false"
|
|
# This is a valid concept!
|
|
$this->timestamp = filemtime( $this->filename );
|
|
Wikimedia\restoreWarnings();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @return bool
|
|
*/
|
|
public function isExpired() {
|
|
Wikimedia\suppressWarnings();
|
|
$lastmod = filemtime( $this->filename );
|
|
Wikimedia\restoreWarnings();
|
|
if ( $lastmod === false ) {
|
|
if ( $this->timestamp === false ) {
|
|
# Still nonexistent
|
|
return false;
|
|
}
|
|
|
|
# Deleted
|
|
wfDebug( "Dependency triggered: {$this->filename} deleted." );
|
|
|
|
return true;
|
|
}
|
|
|
|
if ( $lastmod > $this->timestamp ) {
|
|
# Modified or created
|
|
wfDebug( "Dependency triggered: {$this->filename} changed." );
|
|
|
|
return true;
|
|
}
|
|
|
|
# Not modified
|
|
return false;
|
|
}
|
|
}
|