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

diff --git a/cron/checkProcesses.php b/cron/checkProcesses.php
index c88131f5f51fdb7af8db9dc94da18382f2e3b375..a98a86589dca97798ca4e8a30648dd40c4645f03 100755 (executable)
--- 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 696cdfe71d76e3d77210f4ce8913d43d2415ac41..76a3a3437a735a2985fceb5589aba39125fedfa3 100644 (file)
--- 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 b7da5b1a1c0e4adcfe7dd27ad4e5e3b0f2580aa1..6f760fc69da6b08d7996ba9593ca62cc02f4d339 100644 (file)
--- 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 1c96be67d4ab44a887f6a930b20f4fcd6f54094b..e45c462cc5c3d6568a053385276b535db2ee09be 100755 (executable)
--- 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);