Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
remove unnecessary try catch blocks
This commit is contained in:
commit
bf901eb52f
23
lib/db.php
23
lib/db.php
|
@ -190,18 +190,8 @@ class OC_DB {
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
try{
|
|
||||||
self::$PDO=new PDO($dsn, $user, $pass, $opts);
|
self::$PDO=new PDO($dsn, $user, $pass, $opts);
|
||||||
}catch(PDOException $e) {
|
|
||||||
OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
|
|
||||||
OC_User::setUserId(null);
|
|
||||||
|
|
||||||
// send http status 503
|
|
||||||
header('HTTP/1.1 503 Service Temporarily Unavailable');
|
|
||||||
header('Status: 503 Service Temporarily Unavailable');
|
|
||||||
OC_Template::printErrorPage('Failed to connect to database');
|
|
||||||
die();
|
|
||||||
}
|
|
||||||
// We always, really always want associative arrays
|
// We always, really always want associative arrays
|
||||||
self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
|
self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
|
||||||
self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||||
|
@ -300,18 +290,7 @@ class OC_DB {
|
||||||
// Try to establish connection
|
// Try to establish connection
|
||||||
self::$MDB2 = MDB2::factory( $dsn, $options );
|
self::$MDB2 = MDB2::factory( $dsn, $options );
|
||||||
|
|
||||||
// Die if we could not connect
|
self::raiseExceptionOnError( self::$MDB2 );
|
||||||
if( PEAR::isError( self::$MDB2 )) {
|
|
||||||
OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
|
|
||||||
OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
|
|
||||||
OC_User::setUserId(null);
|
|
||||||
|
|
||||||
// send http status 503
|
|
||||||
header('HTTP/1.1 503 Service Temporarily Unavailable');
|
|
||||||
header('Status: 503 Service Temporarily Unavailable');
|
|
||||||
OC_Template::printErrorPage('Failed to connect to database');
|
|
||||||
die();
|
|
||||||
}
|
|
||||||
|
|
||||||
// We always, really always want associative arrays
|
// We always, really always want associative arrays
|
||||||
self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
|
self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
|
||||||
|
|
Loading…
Reference in New Issue