petermolnar's repositories — wp-ffpc: a3d00edf60f7c51b5ca8e0309f439f0d8560ec24

1.6.4, see readme

Peter Molnar hello@petermolnar.eu

Fri, 12 Sep 2014 09:38:32 +0100

commit

a3d00edf60f7c51b5ca8e0309f439f0d8560ec24

parent

74869fa77f6bd47a6c3edc98bee79c8f423539d9

5 files changed, 16 insertions(+), 16 deletions(-)

jump to

readme.txt

wp-ffpc-backend.php

wp-ffpc-class.php

wp-ffpc-nginx-sample.conf

wp-ffpc.php

M readme.txt → readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XU3DG7LLA76WC
 Tags: cache, page cache, full page cache, nginx, memcached, apc, speed
 Requires at least: 3.0
 Tested up to: 4.0
-Stable tag: 1.6.3
+Stable tag: 1.6.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -105,6 +105,12 @@
 * every A. indicates BIG changes.
 * every .B version indicates new features.
 * every ..C indicates bugfixes for A.B version.
+
+= 1.6.4 =
+*2014-09-12*
+
+* downgraded log level from halting-level fatal to warning ( thank you PHP for the consistent naming... ) in case the selected extension is missing
+* leftover code parts cleanup
 
 = 1.6.3 =
 *2014-09-12*

M wp-ffpc-backend.php → wp-ffpc-backend.php

@@ -8,7 +8,6 @@ *
  * @var string	$plugin_constant	Namespace of the plugin
  * @var mixed	$connection	Backend object storage variable
  * @var boolean	$alive		Alive flag of backend connection
- * @var boolean $network	WordPress Network flag
  * @var array	$options	Configuration settings array
  * @var array	$status		Backends status storage
  * @var array	$cookies	Logged in cookies to search for
@@ -18,14 +17,12 @@ *
  */
 class WP_FFPC_Backend {
 
-	const network_key = 'network';
 	const host_separator  = ',';
 	const port_separator  = ':';
 
 	private $plugin_constant = 'wp-ffpc';
 	private $connection = NULL;
 	private $alive = false;
-	private $network = false;
 	private $options = array();
 	private $status = array();
 	public $cookies = array();
@@ -39,7 +36,7 @@ * @param mixed $config Configuration options
 	* @param boolean $network WordPress Network indicator flah
 	*
 	*/
-	public function __construct( $config, $network = false ) {
+	public function __construct( $config ) {
 
 		/* no config, nothing is going to work */
 		if ( empty ( $config ) ) {
@@ -49,9 +46,6 @@ }
 
 		/* set config */
 		$this->options = $config;
-
-		/* set network flag */
-		$this->network = $network;
 
 		/* these are the list of the cookies to look for when looking for logged in user */
 		$this->cookies = array ( 'comment_author_' , 'wordpressuser_' , 'wp-postpass_', 'wordpress_logged_in_' );
@@ -545,7 +539,7 @@ $keys = array ( $keys => true );
 
 		foreach ( $keys as $key => $dummy ) {
 			if ( ! apc_delete ( $key ) ) {
-				$this->log ( sprintf( __translate__( 'Failed to delete APC entry: %s', $this->plugin_constant ),  $key ), LOG_ERR );
+				$this->log ( sprintf( __translate__( 'Failed to delete APC entry: %s', $this->plugin_constant ),  $key ), LOG_WARNING );
 				//throw new Exception ( __translate__('Deleting APC entry failed with key ', $this->plugin_constant ) . $key );
 			}
 			else {
@@ -631,7 +625,7 @@ $keys = array ( $keys => true );
 
 		foreach ( $keys as $key => $dummy ) {
 			if ( ! apcu_delete ( $key ) ) {
-				$this->log ( sprintf( __translate__( 'Failed to delete APC entry: %s', $this->plugin_constant ),  $key ), LOG_ERR );
+				$this->log ( sprintf( __translate__( 'Failed to delete APC entry: %s', $this->plugin_constant ),  $key ), LOG_WARNING );
 				//throw new Exception ( __translate__('Deleting APC entry failed with key ', $this->plugin_constant ) . $key );
 			}
 			else {
@@ -730,7 +724,7 @@ $keys = array ( $keys => true );
 
 		foreach ( $keys as $key => $dummy ) {
 			if ( ! xcache_unset ( $key ) ) {
-				$this->log ( sprintf( __translate__( 'Failed to delete XCACHE entry: %s', $this->plugin_constant ),  $key ), LOG_ERR );
+				$this->log ( sprintf( __translate__( 'Failed to delete XCACHE entry: %s', $this->plugin_constant ),  $key ), LOG_WARNING );
 				//throw new Exception ( __translate__('Deleting APC entry failed with key ', $this->plugin_constant ) . $key );
 			}
 			else {
@@ -749,7 +743,7 @@ */
 	private function memcached_init () {
 		/* Memcached class does not exist, Memcached extension is not available */
 		if (!class_exists('Memcached')) {
-			$this->log (  __translate__(' Memcached extension missing', $this->plugin_constant ), LOG_ERR );
+			$this->log (  __translate__(' Memcached extension missing, wp-ffpc will not be able to function correctly!', $this->plugin_constant ), LOG_WARNING );
 			return false;
 		}
 
@@ -907,7 +901,7 @@ */
 	private function memcache_init () {
 		/* Memcached class does not exist, Memcache extension is not available */
 		if (!class_exists('Memcache')) {
-			$this->log (  __translate__('PHP Memcache extension missing', $this->plugin_constant ), LOG_ERR );
+			$this->log (  __translate__('PHP Memcache extension missing', $this->plugin_constant ), LOG_WARNING );
 			return false;
 		}

M wp-ffpc-class.php → wp-ffpc-class.php

@@ -174,7 +174,7 @@ */
 	public function plugin_post_init () {
 
 		/* initiate backend */
-		$this->backend = new WP_FFPC_Backend ( $this->options, $this->network );
+		$this->backend = new WP_FFPC_Backend ( $this->options );
 
 		/* get all available post types */
 		$post_types = get_post_types( );

M wp-ffpc-nginx-sample.conf → wp-ffpc-nginx-sample.conf

@@ -93,7 +93,7 @@ if ( $uri ~ "/wp-" ) {
 						set $memcached_request 0;
 				}
 
-				# avoid cache serve of any URL with query strings                                                                       
+				# avoid cache serve of any URL with query strings
 				if ( $args ) {
 					set $memcached_request 0;
 				}

M wp-ffpc.php → wp-ffpc.php

@@ -3,7 +3,7 @@ /*
 Plugin Name: WP-FFPC
 Plugin URI: https://github.com/petermolnar/wp-ffpc
 Description: WordPress in-memory full page cache plugin
-Version: 1.6.3
+Version: 1.6.4
 Author: Peter Molnar <hello@petermolnar.eu>
 Author URI: http://petermolnar.eu/
 License: GPLv3