diff options
| -rw-r--r-- | plugins/Login/Auth.php | 5 | ||||
| -rwxr-xr-x | tests/PHPUnit/Integration/ImportLogsTest.php | 2 |
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; |