wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline

Browse Source
This commit is contained in:
Evan Prodromou 2011-12-02 15:48:43 -05:00
commit 821904230d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/framework.php
View File

@ -160,6 +160,15 @@ function PEAR_ErrorToPEAR_Exception($err)
common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)"); common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)");
// HACK: queue handlers get kicked by the long-query killer, and
// keep the same broken connection. We die here to get a new
// process started.
if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $userInfo)) {
common_log(LOG_ERR, "Lost DB connection; dying.");
exit(100);
}
if ($err->getCode()) { if ($err->getCode()) {
throw new PEAR_Exception($msg, $err, $err->getCode()); throw new PEAR_Exception($msg, $err, $err->getCode());
} else { } else {