Hopefully fix timout problem when parsing statistics

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1502 44740490-163a-0410-bde0-09ae8108e29a

modules/statistics/config-templates/module_statistics.php

@@ -38,6 +38,14 @@ $config = array (
 	 *     'cron_tag' => NULL,
 	 */
 	'cron_tag' => 'daily',
+
+	/*
+	 * Set max running time for this script. This is also controlle by max_execution_time in php.ini
+	 * and is defalut set to 30 sec. Your web server can have other timeout configurations that may
+	 * also interrupt PHP execution. Apache has a Timeout directive and IIS has a
+	 * CGI timeout function. Both default to 300 seconds.
+	 */
+	'time_limit' => 300,
 	
 	'statrules' => array(
 		'sso_hoursday' => array(

modules/statistics/hooks/hook_cron.php

@@ -14,6 +14,11 @@ function statistics_hook_cron(&$croninfo) {
 	if (is_null($statconfig->getValue('cron_tag', NULL))) return;
 	if ($statconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;
 	
+	$maxtime = $statconfig->getInteger('time_limit', NULL);
+	if($maxtime){
+		set_time_limit($maxtime);
+	}
+	
 	try {
 		$aggregator = new sspmod_statistics_Aggregator();
 		$results = $aggregator->aggregate();