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:
authorbenakamoorthi <benaka.moorthi@gmail.com>2013-01-04 09:49:17 +0400
committerbenakamoorthi <benaka.moorthi@gmail.com>2013-01-04 09:49:17 +0400
commit4ddf39367be53529567e010517ea12adcb1f12fe (patch)
tree0b460c6e5fa3fdf4e3061bc36c49295cbfe049b2
parentab4958665214c222287c20d6347e65010d05ce32 (diff)
Fixing build, adding more debug output.
git-svn-id: http://dev.piwik.org/svn/trunk@7732 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r--plugins/Login/Auth.php5
-rwxr-xr-xtests/PHPUnit/Integration/ImportLogsTest.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index af5bd063ee..e83188a83f 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -83,6 +83,11 @@ class Piwik_Login_Auth implements Piwik_Auth
return new Piwik_Auth_Result(Piwik_Auth_Result::SUCCESS, $login, $userToken );
}
}
+
+ if ($this->token_auth !== null)
+ {
+ echo "\nROOT LOGIN: '$rootLogin'\nROOT TOKEN: '$rootToken'\nAUTH SUPPLIED: '{$this->token_auth}\n'";
+ }
return new Piwik_Auth_Result( Piwik_Auth_Result::FAILURE, $this->login, $this->token_auth );
}
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
index e04f012b24..93b631defb 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -183,7 +183,7 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase
exec($cmd, $output, $result);
if ($result !== 0)
{
- throw new Exception("log importer failed: ".implode("\n", $output));
+ throw new Exception("log importer failed: ".implode("\n", $output)."\n\ncommand used: $cmd");
}
return $output;