merged 125:126 for nDatabasesHard

[sql-web.git] / cron / checkProcesses.php

diff --git a/cron/checkProcesses.php b/cron/checkProcesses.php
index c88131f5f51fdb7af8db9dc94da18382f2e3b375..67d3a2c012a0df3facb46a63e2af115185b85f54 100755 (executable)
--- a/cron/checkProcesses.php
+++ b/cron/checkProcesses.php
@@ -5,7 +5,7 @@ require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');
 isOffline() && exit;
 
-define('MAX_PROC_TIME', 20);
+define('MAX_PROC_TIME', 30);
 
 $baddbs = $badusers = $bad = array();
 $result = mysql_query('SHOW FULL PROCESSLIST');
@@ -21,23 +21,27 @@ mysql_free_result($result);
 foreach($bad as $badproc) {
        $mailtos = $mailnames = array();
        $baddb = mysql_escape_string($badproc['db']);
+       if (empty($baddb)) continue;
        $badtime = $badproc['Time'];
        $badquery = $badproc['Info'];
-       if (empty($baddb)) continue;
        $sql = "SELECT User.UserId,User.Name,User.Email
                        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'];
                $mailnames[] = $addy['Name'];
        }
-       if (empty($mailtos)) continue;
+       if (empty($mailtos)) {
+               echo "No email found for $baddb\n";
+               continue;
+       }
        $mailto = implode(', ',$mailtos);
        $mailname = implode(', ',$mailnames);
-       $mailsubj = "[sql] Slow Query on $baddb";
+       $mailsubj = "[sql.mit.edu] Slow Query on $baddb";
        $mailbody = "Dear $mailname:
 
 A slow query was found on your database: $baddb
@@ -48,7 +52,9 @@ been appended to this message for your records. Please optimize your
 queries to avoid having your queries killed in the future. If you have any
 questions, please contact sql@mit.edu.
 
-This SQL Service is available at sql.mit.edu.
+The SQL Service
+Email: <sql@mit.edu>
+Web: http://sql.mit.edu/
 
 ---------------------------------------------------------------------------