From 82ffc3b5413ea30510b30fbd2817e94d2508f024 Mon Sep 17 00:00:00 2001
From: Joe Presbrey <presbrey@mit.edu>
Date: Thu, 1 Dec 2005 09:36:51 +0000
Subject: [PATCH] only kill processes for UL < 10 mysql_error through
 errorhandler

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@90 a142d4bd-2cfb-0310-9673-cb33a7e74f58
---
 cron/checkProcesses.php  | 3 ++-
 lib/dbaccess.lib.php     | 4 ++--
 lib/errorhandler.lib.php | 1 +
 mitsql.cfg.php           | 5 ++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cron/checkProcesses.php b/cron/checkProcesses.php
index c88131f..a98a865 100755
--- a/cron/checkProcesses.php
+++ b/cron/checkProcesses.php
@@ -28,7 +28,8 @@ foreach($bad as $badproc) {
 			FROM `User`
 			NATURAL JOIN DBOwner
 			NATURAL JOIN DB
-			WHERE DB.Name = '$baddb'";
+			WHERE DB.Name = '$baddb'
+			  AND User.UL < 10";
 	$r = fetchRows(DBSelect($sql),'UserId');
 	foreach($r as $addy) {
 		$mailtos[] = $addy['Email'];
diff --git a/lib/dbaccess.lib.php b/lib/dbaccess.lib.php
index 696cdfe..76a3a34 100644
--- a/lib/dbaccess.lib.php
+++ b/lib/dbaccess.lib.php
@@ -12,14 +12,14 @@ function DBSlave($sql) {
 	sessTime($sql);
 	$res = mysql_query($sql);
 	sessTime();
-	if (mysql_error()) die($sql."<br />\n".mysql_error());
+	if (mysql_error()) trigger_error($sql."<br />\n".mysql_error(),E_USER_ERROR);
 	return $res;
 }
 
 function DBSelect($sql) { return DBSlave($sql); }
 function DBInsert($sql) {
 	DBMaster($sql);
-	if (mysql_error()) die($sql."<br />\n".mysql_error());
+	if (mysql_error()) trigger_error($sql."<br />\n".mysql_error(),E_USER_ERROR);
 	return mysql_insert_id();
 }
 function DBUpdate($sql) { DBInsert($sql); }
diff --git a/lib/errorhandler.lib.php b/lib/errorhandler.lib.php
index b7da5b1..6f760fc 100644
--- a/lib/errorhandler.lib.php
+++ b/lib/errorhandler.lib.php
@@ -37,6 +37,7 @@ function ErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
 	if (DEVEL && 0) {
 		echo nl2br($error_msg);
 	} else {
+		$error_msg .= print_r(get_included_files(),1)."\n";
 		$error_msg .= print_r($errcontext,1);
 		error_log($error_msg, 1, $email_to);
 		if ($error_halt) {
diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index 1c96be6..e45c462 100755
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -47,7 +47,10 @@ require_once('defaults.cfg.php');
 if (!OFFLINE) {
 	$cxn = mysql_connect(DBHOST, ADMINUSER, ADMINPASS);
 	mysql_select_db(ADMINDB,$cxn);
-	if (mysql_error()) die(mysql_error());
+	if (mysql_error()) {
+		require_once('errorhandler.lib.php');
+		trigger_error(mysql_error(),E_USER_ERROR);
+	}
 }
 
 chdir($CWD);
-- 
2.45.0