From 00b4843425371e4ff55c82be577a279e248c29fc Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 31 May 2016 16:16:54 -0700
Subject: provide a sort of mutex lock around db logging so it can't possibly
 recurse. Previous attempts to do something similar using other methods
 haven't worked out satisfactorily.

---
 include/dba/dba_driver.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/dba/dba_driver.php')

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 0ab5830ed..df072ed76 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -12,7 +12,7 @@ class DBA {
 
 	static public $dba = null;
 	static public $dbtype = null;
-
+	static public $logging = false;
 
 	/**
 	 * @brief Returns the database driver object.
@@ -421,8 +421,13 @@ function db_getfunc($f) {
 
 function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) {
 
+	if(\DBA::$logging)
+		return;
+
 	$saved = \DBA::$dba->debug;
 	\DBA::$dba->debug = false;
+	\DBA::$logging = true;
 	logger($s,$level,$syslog);
+	\DBA::$logging = false;
 	\DBA::$dba->debug = $saved;
 }
\ No newline at end of file
-- 
cgit v1.2.3