Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2012-03-23 07:39:35 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-03-23 07:39:35 +0400
commita11834efbb2f4ef8a9f6b34325ff43b3bf136df5 (patch)
tree443439905576282a36e9bc4ce1a2aca82a693696 /piwik.php
parenta82e4ddfe12e520247c81790ce99da21ac4e67a9 (diff)
Make sure that exceptions are caught in piwik.php or the webserver might return 500 error and this would fail the system check tests
git-svn-id: http://dev.piwik.org/svn/trunk@6103 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'piwik.php')
-rw-r--r--piwik.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/piwik.php b/piwik.php
index c80f3517ea..654a95cd08 100644
--- a/piwik.php
+++ b/piwik.php
@@ -75,7 +75,11 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
{
$process = new Piwik_Tracker();
- $process->main();
+ try {
+ $process->main();
+ } catch(Exception $e) {
+ echo "Error:" . $e->getMessage();
+ }
ob_end_flush();
if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
{