varnish_expire_cache() function should not have a break at end [#738420]

I got a PHP error calling varnish_expire_cache() from my hook_nodeapi function because varnish_expire_cache() ends with a break, instead of a return. I have attached a patch with the fix.

Here is the function from which I was calling it. I think I am doing this correctly. At least, my testing so far has indicated that URL's are being cleared out of the cache:

function um_common_nodeapi(&$node, $op, $a3, $a4) {
  switch ($op) {
    case 'alter':
       // snip irrelevant code
    break;
    case 'insert':
    case 'update':
	if (module_exists('varnish')) {
          $urls = varnish_get_active_urls($node);
          varnish_expire_cache($urls);
	}
     break;
  }
}

Comment	File	Size	Author
#1	fix-varnish-expire-cache.patch	519 bytes	EvanDonovan

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

File	Size
fix-varnish-expire-cache.patch	519 bytes

Comment #2

EvanDonovan CreditAttribution: EvanDonovan commented 10 March 2010 at 16:25

I noticed that the varnish_get_active_urls() function has been removed in preparation for people to use the experimental Expire.module. So I've created my own, minimalist version of it in my custom module.

I will probably be testing the Expire.module at some point soon, but will have to see how it fits in with the other priorities at my organization. Anyway, at least this seems to meet my basic needs, now that I've fixed the error in the varnish_expire_cache() function.

function varnish_get_active_urls($node) { 	 
	   $urls = array(); 	 
	   $urls[] = 'node/'. $node->nid;
		 // Have removed extra logic - just keep this as simple as possible.
	   foreach($urls as $url) { 	 
	     $alias = drupal_get_path_alias($url);
	     if ($alias != $url) { 	 
	       $urls[] = $alias; 	 
	     } 	 
	   } 	 
	   return $urls; 	 
}

Comment #3

carlos8f CreditAttribution: carlos8f commented 25 May 2010 at 23:35

I came across the same bug. I don't think hook_expire_caches() needs to return anything though, so the break; just needs to be removed.

Comment #4

EvanDonovan CreditAttribution: EvanDonovan commented 9 June 2010 at 15:31

Title:	varnish_expire_cache() function should end with a return, not break	» varnish_expire_cache() function should not have a break at end
Status:	Needs review	» Needs work

You're right, I think :)