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

diff --git a/lib/framework.php b/lib/framework.php
index 4458313eb974ea294e9615727916ebc175f9e256..e7a1829bc697065d4ad56ea0feb21609fa0934f3 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -160,6 +160,15 @@ function PEAR_ErrorToPEAR_Exception($err)
 
     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()) {
         throw new PEAR_Exception($msg, $err, $err->getCode());
     } else {