X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSquidUpdate.php;h=31f7aa68b105f02dc7262c32444d7b6a8d1f2c8c;hb=c53ccc605f1128eefebda9378116fd18223b1ec2;hp=be25eda3cecb59df73e5dc425c64975a51864a6a;hpb=2ca258fd035e7da820747dc509d834c18aeba110;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php index be25eda3ce..31f7aa68b1 100644 --- a/includes/SquidUpdate.php +++ b/includes/SquidUpdate.php @@ -1,46 +1,73 @@ mMaxTitles = $wgMaxSquidPurgeTitles; + } else { + $this->mMaxTitles = $maxTitles; + } + if ( count( $urlArr ) > $this->mMaxTitles ) { + $urlArr = array_slice( $urlArr, 0, $this->mMaxTitles ); + } $this->urlArr = $urlArr; } - /* static */ function newFromLinksTo( &$title ) { + static function newFromLinksTo( &$title ) { + global $wgMaxSquidPurgeTitles; + wfProfileIn( __METHOD__ ); + # Get a list of URLs linking to this page - $id = $title->getArticleID(); - $sql = "SELECT cur_namespace,cur_title FROM links,cur WHERE l_to={$id} and l_from=cur_id" ; - $res = wfQuery ( $sql, DB_READ ) ; + $dbr = wfGetDB( DB_SLAVE ); + $res = $dbr->select( array( 'links', 'page' ), + array( 'page_namespace', 'page_title' ), + array( + 'pl_namespace' => $title->getNamespace(), + 'pl_title' => $title->getDBkey(), + 'pl_from=page_id' ), + __METHOD__ ); $blurlArr = $title->getSquidURLs(); - while ( $BL = wfFetchObject ( $res ) ) - { - $tobj = Title::makeTitle( $BL->cur_namespace, $BL->cur_title ) ; - $blurlArr[] = $tobj->getInternalURL(); + if ( $dbr->numRows( $res ) <= $wgMaxSquidPurgeTitles ) { + foreach ( $res as $BL ) { + $tobj = Title::makeTitle( $BL->page_namespace, $BL->page_title ) ; + $blurlArr[] = $tobj->getInternalURL(); + } } - wfFreeResult ( $res ) ; + + wfProfileOut( __METHOD__ ); return new SquidUpdate( $blurlArr ); } - /* static */ function newFromBrokenLinksTo( &$title ) { - # Get a list of URLs linking to this (currently non-existent) page - $encTitle = $title->getPrefixedDBkey(); - $sql = "SELECT cur_namespace,cur_title FROM brokenlinks,cur WHERE bl_to={$encTitle} AND bl_from=cur_id"; - $res = wfQuery( $sql, DB_READ ); - $blurlArr = array(); - while ( $BL = wfFetchObject( $res ) ) - { - $tobj = Title::makeTitle( $BL->cur_namespace, $BL->cur_title ); - $blurlArr[] = $tobj->getInternalURL(); + /** + * Create a SquidUpdate from an array of Title objects, or a TitleArray object + */ + static function newFromTitles( $titles, $urlArr = array() ) { + global $wgMaxSquidPurgeTitles; + $i = 0; + foreach ( $titles as $title ) { + $urlArr[] = $title->getInternalURL(); + if ( $i++ > $wgMaxSquidPurgeTitles ) { + break; + } } - wfFreeResult( $res ); - return new SquidUpdate( $blurlArr ); + return new SquidUpdate( $urlArr ); } - /* static */ function newSimplePurge( &$title ) { + static function newSimplePurge( &$title ) { $urlArr = $title->getSquidURLs(); - return new SquidUpdate( $blurlArr ); + return new SquidUpdate( $urlArr ); } function doUpdate() { @@ -48,104 +75,128 @@ class SquidUpdate { } /* Purges a list of Squids defined in $wgSquidServers. - $urlArr should contain the full URLs to purge as values + $urlArr should contain the full URLs to purge as values (example: $urlArr[] = 'http://my.host/something') XXX report broken Squids per mail or log */ - /* static */ function purge( $urlArr ) { - global $wgSquidServers; + static function purge( $urlArr ) { + global $wgSquidServers, $wgHTCPMulticastAddress, $wgHTCPPort; - if ( $wgSquidServers == "echo" ) { - echo implode("
\n", $urlArr); + /*if ( (@$wgSquidServers[0]) == 'echo' ) { + echo implode("
\n", $urlArr) . "
\n"; + return; + }*/ + + if( !$urlArr ) { return; } - $maxsocketspersquid = 8; // socket cap per Squid - $urlspersocket = 400; // 400 seems to be a good tradeoff, opening a socket takes a while - $firsturl = $urlArr[0]; - unset($urlArr[0]); - $urlArr = array_values($urlArr); - $sockspersq = max(ceil(count($urlArr) / $urlspersocket ),1); - if ($sockspersq == 1) { - /* the most common case */ - $urlspersocket = count($urlArr); - } else if ($sockspersq > $maxsocketspersquid ) { - $urlspersocket = ceil(count($urlArr) / $maxsocketspersquid); - $sockspersq = $maxsocketspersquid; + if ( $wgHTCPMulticastAddress && $wgHTCPPort ) { + return SquidUpdate::HTCPPurge( $urlArr ); } - $totalsockets = count($wgSquidServers) * $sockspersq; - $sockets = Array(); - - /* this sets up the sockets and tests the first socket for each server. */ - for ($ss=0;$ss < count($wgSquidServers);$ss++) { - $failed = false; - $so = 0; - while ($so < $sockspersq && !$failed) { - if ($so == 0) { - /* first socket for this server, do the tests */ - list($server, $port) = explode(':', $wgSquidServers[$ss]); - if(!isset($port)) $port = 80; - $socket = @fsockopen($server, $port, $error, $errstr, 3); - if (!$socket) { - $failed = true; - $totalsockets -= $sockspersq; - } else { - @fputs($socket,"PURGE " . $firsturl . " HTTP/1.0\r\n". - "Connection: Keep-Alive\r\n\r\n"); - $res = @fread($socket,512); - /* Squid only returns http headers with 200 or 404 status, - if there's more returned something's wrong */ - if (strlen($res) > 250) { - fclose($socket); - $failed = true; - $totalsockets -= $sockspersq; - } else { - @stream_set_blocking($socket,false); - $sockets[] = $socket; - } - } - } else { - /* open the remaining sockets for this server */ - list($server, $port) = explode(':', $wgSquidServers[$ss]); - if(!isset($port)) $port = 80; - $sockets[] = @fsockopen($server, $port, $error, $errstr, 2); - @stream_set_blocking($sockets[$s],false); - } - $so++; - } + + wfProfileIn( __METHOD__ ); + + $maxSocketsPerSquid = 8; // socket cap per Squid + $urlsPerSocket = 400; // 400 seems to be a good tradeoff, opening a socket takes a while + $socketsPerSquid = ceil( count( $urlArr ) / $urlsPerSocket ); + if ( $socketsPerSquid > $maxSocketsPerSquid ) { + $socketsPerSquid = $maxSocketsPerSquid; } - if ($urlspersocket > 0) { - /* now do the heavy lifting. The fread() relies on Squid returning only the headers */ - for ($r=0;$r < $urlspersocket;$r++) { - for ($s=0;$s < $totalsockets;$s++) { - if($r != 0) { - $res = ''; - $esc = 0; - while (strlen($res) < 100 && $esc < 200 ) { - $res .= @fread($sockets[$s],512); - $esc++; - usleep(20); - } - } - $urindex = $r + $urlspersocket * ($s - $sockspersq * floor($s / $sockspersq)); - @fputs($sockets[$s],"PURGE " . $urlArr[$urindex] . " HTTP/1.0\r\n". - "Connection: Keep-Alive\r\n\r\n"); + $pool = new SquidPurgeClientPool; + $chunks = array_chunk( $urlArr, ceil( count( $urlArr ) / $socketsPerSquid ) ); + foreach ( $wgSquidServers as $server ) { + foreach ( $chunks as $chunk ) { + $client = new SquidPurgeClient( $server ); + foreach ( $chunk as $url ) { + $client->queuePurge( $url ); } + $pool->addClient( $client ); } } + $pool->run(); - foreach ($sockets as $socket) { - $res = ''; - $esc = 0; - while (strlen($res) < 100 && $esc < 200 ) { - $res .= @fread($socket,1024); - $esc++; - usleep(20); + wfProfileOut( __METHOD__ ); + } + + static function HTCPPurge( $urlArr ) { + global $wgHTCPMulticastAddress, $wgHTCPMulticastTTL, $wgHTCPPort; + wfProfileIn( __METHOD__ ); + + $htcpOpCLR = 4; // HTCP CLR + + // FIXME PHP doesn't support these socket constants (include/linux/in.h) + if( !defined( "IPPROTO_IP" ) ) { + define( "IPPROTO_IP", 0 ); + define( "IP_MULTICAST_LOOP", 34 ); + define( "IP_MULTICAST_TTL", 33 ); + } + + // pfsockopen doesn't work because we need set_sock_opt + $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP ); + if ( $conn ) { + // Set socket options + socket_set_option( $conn, IPPROTO_IP, IP_MULTICAST_LOOP, 0 ); + if ( $wgHTCPMulticastTTL != 1 ) + socket_set_option( $conn, IPPROTO_IP, IP_MULTICAST_TTL, + $wgHTCPMulticastTTL ); + + foreach ( $urlArr as $url ) { + if( !is_string( $url ) ) { + throw new MWException( 'Bad purge URL' ); + } + $url = SquidUpdate::expand( $url ); + + // Construct a minimal HTCP request diagram + // as per RFC 2756 + // Opcode 'CLR', no response desired, no auth + $htcpTransID = rand(); + + $htcpSpecifier = pack( 'na4na*na8n', + 4, 'HEAD', strlen( $url ), $url, + 8, 'HTTP/1.0', 0 ); + + $htcpDataLen = 8 + 2 + strlen( $htcpSpecifier ); + $htcpLen = 4 + $htcpDataLen + 2; + + // Note! Squid gets the bit order of the first + // word wrong, wrt the RFC. Apparently no other + // implementation exists, so adapt to Squid + $htcpPacket = pack( 'nxxnCxNxxa*n', + $htcpLen, $htcpDataLen, $htcpOpCLR, + $htcpTransID, $htcpSpecifier, 2); + + // Send out + wfDebug( "Purging URL $url via HTCP\n" ); + socket_sendto( $conn, $htcpPacket, $htcpLen, 0, + $wgHTCPMulticastAddress, $wgHTCPPort ); } + } else { + $errstr = socket_strerror( socket_last_error() ); + wfDebug( __METHOD__ . "(): Error opening UDP socket: $errstr\n" ); + } + wfProfileOut( __METHOD__ ); + } - @fclose($socket); + /** + * Expand local URLs to fully-qualified URLs using the internal protocol + * and host defined in $wgInternalServer. Input that's already fully- + * qualified will be passed through unchanged. + * + * This is used to generate purge URLs that may be either local to the + * main wiki or include a non-native host, such as images hosted on a + * second internal server. + * + * Client functions should not need to call this. + * + * @return string + */ + static function expand( $url ) { + global $wgInternalServer; + if( $url != '' && $url{0} == '/' ) { + return $wgInternalServer . $url; } + return $url; } } -?>