friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

more defensive measures against failed or lost DB

This commit is contained in:
Friendika 2011-01-10 20:14:19 -08:00
parent cb1832a755
commit 9493c29810
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/dba.php
View File

@ -46,7 +46,7 @@ class dba {
elseif($result === true) elseif($result === true)
$mesg = 'true'; $mesg = 'true';
else else
$mesg = $result->num_rows.' results' . EOL; $mesg = $result->num_rows . ' results' . EOL;
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
@ -132,11 +132,29 @@ function q($sql) {
global $db; global $db;
$args = func_get_args(); $args = func_get_args();
unset($args[0]); unset($args[0]);
$ret = $db->q(vsprintf($sql,$args));
return $ret; if($db) {
$ret = $db->q(vsprintf($sql,$args));
return $ret;
}
/**
*
* This will happen occasionally trying to store the
* session data after abnormal program termination
*
*/
logger('dba: no database: ' . print_r($args,true));
return false;
}} }}
// raw db query, no arguments /**
*
* Raw db query, no arguments
*
*/
if(! function_exists('dbq')) { if(! function_exists('dbq')) {
function dbq($sql) { function dbq($sql) {