stats - final adjustments

Author: [email protected]

Root_AdminActions.php

@@ -47,7 +47,8 @@ private function _get_handler( $action ) {
 				'licensing' => 'Licensing_AdminActions',
 				'extensions' => 'Extensions_AdminActions',
 				'default' => 'Generic_AdminActions_Default',
-				'support' => 'Support_AdminActions'
+				'support' => 'Support_AdminActions',
+				'ustats' => 'UsageStatistics_AdminActions'
 			);
 			$handlers = apply_filters( 'w3tc_admin_actions', $handlers );
 		}

UsageStatistics_AdminActions.php

@@ -0,0 +1,23 @@
+<?php
+namespace W3TC;
+
+
+
+class UsageStatistics_AdminActions {
+	private $_config = null;
+
+
+
+	public function __construct() {
+		$this->_config = Dispatcher::config();
+	}
+
+
+
+	public function w3tc_ustats_note_disable() {
+		$this->_config->set( 'stats.enabled', false );
+		$this->_config->save();
+
+		Util_Admin::redirect( array(), true );
+	}
+}

UsageStatistics_GeneralPage_View.php

@@ -27,13 +27,15 @@
 		'key' => 'stats.slot_seconds',
 		'label' => __( 'Slot time (seconds):', 'w3-total-cache' ),
 		'control' => 'textbox',
+		'textbox_type' => 'number',
 		'description' =>
 		'The duration of time in seconds to collect statistics per interval.'
 	) );
 Util_Ui::config_item( array(
 		'key' => 'stats.slots_count',
 		'label' => __( 'Slots collected:', 'w3-total-cache' ),
 		'control' => 'textbox',
+		'textbox_type' => 'number',
 		'description' =>
 		'The number of intervals that are represented in the graph.'
 	) );
@@ -51,14 +53,6 @@
 		'disabled' => ( $is_pro ? null : true ),
 		'description' => __( 'Enable collecting statistics from an Access Log.  This provides much more precise statistics.', 'w3-total-cache' )
 	) );
-Util_Ui::config_item( array(
-		'key' => 'stats.access_log.filename',
-		'label' => __( 'Access Log Filename:', 'w3-total-cache' ),
-		'control' => 'textbox',
-		'textbox_size' => 60,
-		'description' =>
-		'Where your access log is located.'
-	) );
 Util_Ui::config_item( array(
 		'key' => 'stats.access_log.webserver',
 		'label' => __( 'Webserver:', 'w3-total-cache' ),
@@ -67,8 +61,16 @@
 			'apache' => 'Apache',
 			'nginx' => 'Nginx'
 		),
-		'description' =>
-		'Webserver type generating access logs.'
+		'description' => 'Webserver type generating access logs.'
+	) );
+Util_Ui::config_item( array(
+		'key' => 'stats.access_log.filename',
+		'label' => __( 'Access Log Filename:', 'w3-total-cache' ),
+		'control' => 'textbox',
+		'textbox_size' => 60,
+		'description' => 'Where your access log is located.',
+		'control_after' =>
+			'<input type="button" class="button" id="ustats_access_log_test" value="Test" /><span id="ustats_access_log_test_result" style="padding-left: 20px"></span>'
 	) );
 Util_Ui::config_item( array(
 		'key' => 'stats.access_log.format',
@@ -100,4 +102,19 @@
 	}
 	jQuery('#stats__access_log__format').val(v);
 });
+
+jQuery('#ustats_access_log_test').click(function() {
+	var params = {
+		action: 'w3tc_ajax',
+		_wpnonce: w3tc_nonce,
+		w3tc_action: 'ustats_access_log_test',
+		filename: jQuery('#stats__access_log__filename').val()
+	};
+
+	jQuery.post(ajaxurl, params, function(data) {
+		jQuery('#ustats_access_log_test_result').text(data);
+	}).fail(function() {
+		jQuery('#ustats_access_log_test_result').text('Check failed');
+	});
+});
 </script>

UsageStatistics_Page_View.css

@@ -94,5 +94,10 @@ td.ustats_td_value {
 }
 .ustats_php_php_requests_pagecache_miss_level2 {
 	width: 50%;
-	white-space: nowrap;
+}
+
+@media (max-width: 1500px) {
+	.ustats_php_php_requests_pagecache_miss_level2 {
+		width: 100%
+	}
 }

UsageStatistics_Page_View.php

@@ -81,7 +81,10 @@
 			);
 			$this->summary_item(
 				'php_php_requests_pagecache_miss',
-				'Not cached'
+				'Not cached',
+				false,
+				'',
+				'#990000'
 			);
 			echo '<div class="ustats_php_php_requests_pagecache_miss_level2_wrap">';
 			$this->summary_item(
@@ -328,6 +331,8 @@
 			<div class="ustats_dbcache_time_ms">
 				Time taken: <span></span> ms
 			</div>
+
+			<a href="?page=w3tc_stats&view=db_requests">Slowest requests (in debug mode only)</a>
 		</div>
 		<div class="ustats_block_chart">
 			Time taken for database activity
@@ -346,8 +351,6 @@
 			<div class="ustats_wpdb_calls_per_second">
 				Calls/sec: <span></span>
 			</div>
-
-			<a href="?page=w3tc_stats&view=db_requests">Slowest requests (in debug mode only)</a>
 		</div>
 		<div class="ustats_block_chart">
 			Requests

UsageStatistics_Page_View_NoDebugMode.php

@@ -10,7 +10,7 @@
 	<?php Util_Ui::postbox_header( __( 'Usage Statistics', 'w3-total-cache' ) ); ?>
 
 	<p>
-		That data are collected only when Debug Mode enabled.
+		Usage Statistics is collected only when Debug Mode is enabled.
 	</p>
 
 	<a href="admin.php?page=w3tc_general#debug" class="button-primary">Enable it here</a>

UsageStatistics_Plugin_Admin.php

@@ -9,6 +9,8 @@ function run() {
 
 		add_filter( 'w3tc_admin_menu', array( $this, 'w3tc_admin_menu' ) );
 		add_action( 'w3tc_ajax_ustats_get', array( $this, 'w3tc_ajax_ustats_get' ) );
+		add_action( 'w3tc_ajax_ustats_access_log_test',
+			array( $this, 'w3tc_ajax_ustats_access_log_test' ) );
 
 		add_filter( 'w3tc_usage_statistics_summary_from_history', array(
 				'W3TC\UsageStatistics_Sources',
@@ -33,9 +35,26 @@ function run() {
 				'admin_print_scripts_w3tc_stats'
 			) );
 
+		add_action( 'w3tc_config_ui_save', array(
+				$this,
+				'w3tc_config_ui_save'
+			), 10, 2 );
+
 		add_filter( 'w3tc_notes', array( $this, 'w3tc_notes' ) );
 	}
 
+#
+
+
+	public function w3tc_config_ui_save( $config, $old_config ) {
+		if ( $config->get( 'stats.slot_seconds' ) !=
+				$old_config->get( 'stats.slot_seconds' ) ) {
+			// flush all stats otherwise will be inconsistent
+			$storage = new UsageStatistics_StorageWriter();
+			$storage->reset();
+		}
+	}
+
 
 
 	public function w3tc_notes( $notes ) {
@@ -45,8 +64,13 @@ public function w3tc_notes( $notes ) {
 		if ( $c->get_boolean( 'stats.enabled' ) &&
 				!$state_master->get_boolean( 'common.hide_note_stats_enabled' ) ) {
 			$notes['stats_enabled'] = sprintf(
-				__( 'You’re running stats, it’s using Resources and not recommend to run continuously. %s',
+				__( 'W3 Total Cache: Statistics collection is currently enabled. This consumes additional resources, and is not recommended to be run continuously. %s %s',
 					'w3-total-cache' ),
+				Util_Ui::button_link(
+					__( 'Disable statistics', 'w3-total-cache' ),
+					Util_Ui::url( array( 'w3tc_ustats_note_disable' => 'y' ) ),
+					false, 'button',
+					'w3tc_note_stats_disable' ),
 				Util_Ui::button_hide_note2( array(
 						'w3tc_default_config_state_master' => 'y',
 						'key' => 'common.hide_note_stats_enabled',
@@ -83,4 +107,19 @@ public function w3tc_ajax_ustats_get() {
 		echo json_encode( $summary );
 		exit();
 	}
+
+
+
+	public function w3tc_ajax_ustats_access_log_test() {
+		$filename = $_REQUEST['filename'];
+
+		$filename = str_replace( '://', '/', $filename );
+		$h = @fopen( $filename, 'rb' );
+		if ( !$h ) {
+			echo 'Failed to open file ' . $filename;
+		} else {
+			echo 'Success';
+		}
+		exit();
+	}
 }

UsageStatistics_Source_AccessLog.php

@@ -67,15 +67,18 @@ static public function w3tc_usage_statistics_summary_from_history( $summary, $hi
 
 
 
-	public function __construct() {
-		$c = Dispatcher::config();
-		$accesslog_format = $c->get_string( 'stats.access_log.format' );
-		$webserver = $c->get_string( 'stats.access_log.webserver' );
+	/**
+	 * array( 'webserver', 'format', 'filename' )
+	 */
+	public function __construct( $data ) {
+		$format = $data['format'];
+		$webserver = $data['webserver'];
+		$this->accesslog_filename = str_replace( '://', '/', $data['filename'] );
 
 		if ( $webserver == 'nginx' ) {
-			$line_regexp = $this->logformat_to_regexp_nginx( $accesslog_format );
+			$line_regexp = $this->logformat_to_regexp_nginx( $format );
 		} else {
-			$line_regexp = $this->logformat_to_regexp_apache( $accesslog_format );
+			$line_regexp = $this->logformat_to_regexp_apache( $format );
 		}
 
 		$this->line_regexp = apply_filters( 'w3tc_ustats_access_log_format_regexp',
@@ -92,14 +95,10 @@ public function w3tc_usage_statistics_history_set( $history ) {
 		}
 
 		$this->history = $history;
-
-		$this->setup_history_item( count( $history ) - 1 );
-
-		$c = Dispatcher::config();
-		$accesslog_filename = $c->get_string( 'stats.access_log.filename' );
 		$this->min_time = time();
+		$this->setup_history_item( count( $history ) - 1 );
 
-		$h = @fopen( $accesslog_filename, 'rb' );
+		$h = @fopen( $this->accesslog_filename, 'rb' );
 		if ( !$h ) {
 			error_log( 'Failed to open access log for usage statisics collection' );
 			return $history;

UsageStatistics_Sources.php

@@ -56,7 +56,12 @@ static public function w3tc_usage_statistics_summary_from_history( $summary, $hi
 
 		// access log data
 		if ( $c->get_boolean( 'stats.access_log.enabled' ) ) {
-			$o = new UsageStatistics_Source_AccessLog();
+			$o = new UsageStatistics_Source_AccessLog( array(
+				'webserver' => $c->get_string( 'stats.access_log.webserver' ),
+				'filename' => $c->get_string( 'stats.access_log.filename' ),
+				'format' => $c->get_string( 'stats.access_log.format' )
+			) );
+
 			$summary = $o->w3tc_usage_statistics_summary_from_history(
 				$summary, $history );
 		}
@@ -111,7 +116,12 @@ static public function w3tc_usage_statistics_history_set( $history ) {
 		$c = Dispatcher::config();
 		if ( $c->get_boolean( 'stats.access_log.enabled' ) ) {
 			// read access log
-			$o = new UsageStatistics_Source_AccessLog();
+			$o = new UsageStatistics_Source_AccessLog( array(
+				'webserver' => $c->get_string( 'stats.access_log.webserver' ),
+				'filename' => $c->get_string( 'stats.access_log.filename' ),
+				'format' => $c->get_string( 'stats.access_log.format' )
+			) );
+
 			$history = $o->w3tc_usage_statistics_history_set( $history );
 		}
 

UsageStatistics_StorageWriter.php

@@ -48,6 +48,17 @@ public function __construct() {
 
 
 
+	public function reset() {
+		if ( !is_null( $this->cache_storage ) ) {
+			$this->cache_storage->set( 'hotspot_endtime', 0 );
+		}
+
+		update_site_option( 'w3tc_stats_hotspot_start', time() );
+		update_site_option( 'w3tc_stats_history', '' );
+	}
+
+
+
 	public function counter_add( $metric, $value ) {
 		if ( !is_null( $this->cache_storage ) ) {
 			$this->cache_storage->counter_add( $metric, $value );

Util_Ui.php

@@ -352,8 +352,9 @@ static public function label( $id, $text ) {
 	 * @param bool    $disabled
 	 * @param int     $size
 	 */
-	static public function textbox( $id, $name, $value, $disabled = false, $size = 40 ) {
-		echo '<input class="enabled" type="text" id="' . esc_attr( $id ) .
+	static public function textbox( $id, $name, $value, $disabled = false, $size = 40, $type = 'text' ) {
+		echo '<input class="enabled" type="' . esc_attr( $type ) .
+			'" id="' . esc_attr( $id ) .
 			'" name="' . esc_attr( $name ) .
 			'" value="' . esc_attr( $value ) . '" ';
 		disabled( $disabled );
@@ -597,7 +598,8 @@ static public function table_tr( $a ) {
 			elseif ( $key == 'textbox' )
 				Util_Ui::textbox( $id, $e['name'], $e['value'],
 					( isset( $e['disabled'] ) ? $e['disabled'] : false ),
-					( !empty( $e['size'] ) ? $e['size'] : 20 ) );
+					( !empty( $e['size'] ) ? $e['size'] : 20 ),
+					( !empty( $e['type'] ) ? $e['type'] : 'text' ) );
 			elseif ( $key == 'textarea' )
 				Util_Ui::textarea( $id, $e['name'], $e['value'],
 					( isset( $e['disabled'] ) ? $e['disabled'] : false ) );
@@ -691,6 +693,7 @@ static public function config_item( $a ) {
 					'name' => Util_Ui::config_key_to_http_name( $a['key'] ),
 					'value' => $a['value'],
 					'disabled' => $disabled,
+					'type' => isset( $a['textbox_type'] ) ?  $a['textbox_type'] : null,
 					'size' => isset( $a['textbox_size'] ) ?  $a['textbox_size'] : null
 				);
 			} else if ( $a['control'] == 'textarea' ) {