Commit 6e97d69fceabeb479f6cc4edf68d5870b77e2ab5

Sugarize pings stat


13	13	geo=US v=v
14	14	done
15	15
16		for time in -2day -1day now; do
	16	for time in -2day -1day; do
17	17	date=$(date +%F -d $time)
18	18	php -f maintenance.php weekly $date
19	19	php -f maintenance.php global_stats $date
…	…
24	24	php -f maintenance.php total
25	25	php -f maintenance.php ADU
26	26	php -f maintenance.php gc
27		php -f maintenance.php publish_files
	27	#php -f maintenance.php publish_files
28	28	php -f maintenance.php reviews
29	29	php -f maintenance.php user_ratings
30	30	php -f maintenance.php ratings


738	738
739	739	// These stats are specific to the latest available metrics data import
740	740
741		$date = 'SELECT IFNULL(MAX(date),NOW()) FROM update_counts';
	741	$last_date = "SELECT IFNULL(MAX(date),'{$date}') FROM update_counts WHERE date <= '{$date}'";
742	742
743	743	$variable_date_stats = array(
744		'addon_total_updatepings' => "SELECT SUM(count) FROM update_counts WHERE date = ({$date})",
745		'collector_updatepings' => "SELECT count FROM update_counts WHERE addon_id = 11950 AND date = ({$date})"
	744	'addon_total_updatepings' => "SELECT SUM(count) FROM update_counts WHERE date = '{$last_date}'",
	745	'collector_updatepings' => "SELECT count FROM update_counts WHERE addon_id = 11950 AND date = '{$last_date}'"
746	746	);
747	747
748	748	foreach ($variable_date_stats as $stat => $query) {
749	749	debug("Updating {$stat}...");
750	750
751		$db->write("REPLACE INTO global_stats (name, count, date) VALUES ('{$stat}', IFNULL(({$query}),0), ({$date}))");
	751	$db->write("REPLACE INTO global_stats (name, count, date) VALUES ('{$stat}', IFNULL(({$query}),0), '{$date}')");
	752	$db->write("REPLACE INTO global_stats (name, count, date) VALUES ('{$stat}', IFNULL(({$query}),0), NOW())");
752	753
753	754	$affected_rows += mysql_affected_rows();
754	755	}


83	83	}
84	84	else {
85	85	$addon_id = $this->guids[$details['addon']['guid']];
86		$date = date('Y-m-d', $details['unixtime']);
87
	86	$date = date('Ymd', $details['unixtime']);
88	87	// Bug 468570
89	88	if ($date != $this->date) {
90		$this->totalSkipped['incorrect_date']++;
91		outputIfVerbose("[UpdatePingCounter] Skipping out of range date {$date} for add-on id {$addon_id}");
92		return;
	89	#$this->totalSkipped['incorrect_date']++;
	90	#outputIfVerbose("[UpdatePingCounter] Skipping out of range date {$date} for add-on id {$addon_id}");
	91	#return;
93	92	}
94	93
95	94	if (empty($this->counts[$date]))


152	152	if ($this->type == 'downloads')
153	153	$pattern = 'downloads/file/';
154	154	elseif ($this->type == 'updatepings')
155		$pattern = 'VersionCheck.php';
	155	$pattern = 'services/update-aslo.php';
156	156	elseif ($this->type == 'collections')
157	157	$pattern = 'GET [A-Za-z/-]*collections';
158	158
…	…
243	243	// Break up URL into pieces we need for download counts or update pings
244	244	preg_match("/(file\|VersionCheck\.php)(\/([0-9]))?(\?reqVersion=([^&]+)&id=([^&]+)(&version=([^&]+))?(&maxAppVersion=([^&]+))?(&status=([^&]+))?(&appID=([^&]+))?(&appVersion=([^&]+))?(&appOS=([^&]+))?(&appABI=(\S))?)?/", $log_data['path'], $matches);
245	245
	246	if (empty($matches)) {
	247	preg_match("/\/services\/update-aslo.php\?id=([^&]+)&appVersion=([^&]+)/", $log_data['path'], $matches);
	248	if (!empty($matches)) {
	249	$log_data['type'] = 'updatepings';
	250	$log_data['addon']['reqVersion'] = null;
	251	$log_data['addon']['guid'] = $matches[1];
	252	$log_data['addon']['version'] = null;
	253	$log_data['addon']['maxAppVersion'] = null;
	254	$log_data['addon']['status'] = null;
	255	$log_data['addon']['appID'] = null;
	256	$log_data['addon']['appVersion'] = $matches[2];
	257	$log_data['addon']['appOS'] = null;
	258	$log_data['addon']['appABI'] = null;
	259	return $log_data;
	260	}
	261	}
	262
246	263	if (empty($matches)) {
247	264	// If that first crazy regex fails, let's see if it's a collection
248	265	preg_match("/(collections)\/success\?i=([0-9,].+)/", $log_data['path'], $matches);