X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=8e2d18db600cd5f39c3ffdb295082db85270b1f1;hb=43ceb721963fb7c303d26ef5a999a275144dd5c6;hp=17acf9432804196400ed0c1739baf9c956743c2d;hpb=fd5f151a7232d2b35dd823ec1763420eea97a831;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index 17acf94328..8e2d18db60 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -138,31 +138,55 @@ class dba {
 		return $return;
 	}
 
+	/**
+	 * @brief Analyze a database query and log this if some conditions are met.
+	 *
+	 * @param string $query The database query that will be analyzed
+	 */
 	public function log_index($query) {
 		$a = get_app();
 
-		if (($a->config["system"]["db_log_index"] == "") OR ($a->config["system"]["db_log_index_watch"] == "") OR
-			(intval($a->config["system"]["db_loglimit_index"]) == 0)) {
+		if ($a->config["system"]["db_log_index"] == "") {
 			return;
 		}
 
+		// Don't explain an explain statement
 		if (strtolower(substr($query, 0, 7)) == "explain") {
 			return;
 		}
 
+		// Only do the explain on "select", "update" and "delete"
+		if (!in_array(strtolower(substr($query, 0, 6)), array("select", "update", "delete"))) {
+			return;
+		}
+
 		$r = $this->q("EXPLAIN ".$query);
 		if (!dbm::is_result($r)) {
 			return;
 		}
 
 		$watchlist = explode(',', $a->config["system"]["db_log_index_watch"]);
+		$blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]);
 
 		foreach ($r AS $row) {
-			if (in_array($row['key'], $watchlist) AND
-				($row['rows'] >= intval($a->config["system"]["db_loglimit_index"]))) {
+			if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
+				$log = (in_array($row['key'], $watchlist) AND
+					($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
+			} else
+				$log = false;
+
+			if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
+				$log = true;
+			}
+
+			if (in_array($row['key'], $blacklist) OR ($row['key'] == "")) {
+				$log = false;
+			}
+
+			if ($log) {
 				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 				@file_put_contents($a->config["system"]["db_log_index"], datetime_convert()."\t".
-						$row['key']."\t".$row['rows']."\t".
+						$row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
 						basename($backtrace[1]["file"])."\t".
 						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
 						substr($query, 0, 2000)."\n", FILE_APPEND);