open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prettier error output. Let´s see how many more low hanging fruits I find on my way to the real bug that I want to fix ;-)

Browse Source
remotes/origin/stable5
Frank Karlitschek 12 years ago
parent 67f9f079ae
commit fb5d0db037
1 changed files with 38 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 47
      lib/db.php

47
lib/db.php
Unescape View File

@ -168,7 +168,10 @@ class OC_DB {
try{ try{
self::$PDO=new PDO($dsn, $user, $pass, $opts); self::$PDO=new PDO($dsn, $user, $pass, $opts);
}catch(PDOException $e) { }catch(PDOException $e) {
echo( '<b>can not connect to database, using '.$type.'. ('.$e->getMessage().')</center>'); $error['error']='<b>can not connect to database, using '.$type.'. ('.$e->getMessage().')</center>';
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die(); die();
} }
// We always, really always want associative arrays // We always, really always want associative arrays
@ -263,9 +266,12 @@ class OC_DB {
// Die if we could not connect // Die if we could not connect
if( PEAR::isError( self::$MDB2 )) { if( PEAR::isError( self::$MDB2 )) {
echo( '<b>can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')</center>');
OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL); OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL); OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
$error['error']='<b>can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')</center>';
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die(); die();
} }
@ -326,7 +332,11 @@ class OC_DB {
$entry .= 'Offending command was: '.htmlentities($query).'<br />'; $entry .= 'Offending command was: '.htmlentities($query).'<br />';
OC_Log::write('core', $entry, OC_Log::FATAL); OC_Log::write('core', $entry, OC_Log::FATAL);
error_log('DB error: '.$entry); error_log('DB error: '.$entry);
die( $entry ); $error['error']=$entry;
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die();
} }
}else{ }else{
try{ try{
@ -336,7 +346,11 @@ class OC_DB {
$entry .= 'Offending command was: '.htmlentities($query).'<br />'; $entry .= 'Offending command was: '.htmlentities($query).'<br />';
OC_Log::write('core', $entry, OC_Log::FATAL); OC_Log::write('core', $entry, OC_Log::FATAL);
error_log('DB error: '.$entry); error_log('DB error: '.$entry);
die( $entry ); $error['error']=$entry;
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die();
} }
$result=new PDOStatementWrapper($result); $result=new PDOStatementWrapper($result);
} }
@ -449,7 +463,11 @@ class OC_DB {
// Die in case something went wrong // Die in case something went wrong
if( $definition instanceof MDB2_Schema_Error ) { if( $definition instanceof MDB2_Schema_Error ) {
die( $definition->getMessage().': '.$definition->getUserInfo()); $error['error']=$definition->getMessage().': '.$definition->getUserInfo();
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die();
} }
if(OC_Config::getValue('dbtype', 'sqlite')==='oci') { if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
@ -461,8 +479,11 @@ class OC_DB {
// Die in case something went wrong // Die in case something went wrong
if( $ret instanceof MDB2_Error ) { if( $ret instanceof MDB2_Error ) {
echo (self::$MDB2->getDebugOutput()); $error['error']=self::$MDB2->getDebugOutput().' '.$ret->getMessage() . ': ' . $ret->getUserInfo();
die ($ret->getMessage() . ': ' . $ret->getUserInfo()); $error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die();
} }
return true; return true;
@ -575,7 +596,11 @@ class OC_DB {
$entry .= 'Offending command was: ' . $query . '<br />'; $entry .= 'Offending command was: ' . $query . '<br />';
OC_Log::write('core', $entry, OC_Log::FATAL); OC_Log::write('core', $entry, OC_Log::FATAL);
error_log('DB error: '.$entry); error_log('DB error: '.$entry);
die( $entry ); $error['error']=$entry;
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die();
} }
if($result->numRows() == 0) { if($result->numRows() == 0) {
@ -607,7 +632,11 @@ class OC_DB {
$entry .= 'Offending command was: ' . $query.'<br />'; $entry .= 'Offending command was: ' . $query.'<br />';
OC_Log::write('core', $entry, OC_Log::FATAL); OC_Log::write('core', $entry, OC_Log::FATAL);
error_log('DB error: ' . $entry); error_log('DB error: ' . $entry);
die( $entry ); $error['error']=$entry;
$error['hint']='';
$errors[]=$error;
OC_Template::printGuestPage("", "error", array("errors" => $errors));
die();
} }
return $result->execute(); return $result->execute();

Write Preview
Loading…
Cancel
Save