From a33558a61efc244ad8c809748e6ee64413e3a217 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 2 Sep 2013 12:33:59 +0400
Subject: pass logfile to child tasks if locking is possible, lock logfile
 before writing, add kludge to prevent update_rss_feed unneeded debugging go
 into master logfile

---
 include/functions.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 2d6716b81..8ede14a0b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -139,6 +139,8 @@
 	 * @return void
 	 */
 	function _debug($msg, $show = true) {
+		if (defined('SUPPRESS_DEBUGGING'))
+			return false;
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
@@ -153,7 +155,29 @@
 			$fp = fopen(LOGFILE, 'a+');
 
 			if ($fp) {
+				$locked = false;
+
+				if (function_exists("flock")) {
+					$tries = 0;
+
+					// try to lock logfile for writing
+					while ($tries < 5 && !$locked = flock($fp, LOCK_EX | LOCK_NB)) {
+						sleep(1);
+						++$tries;
+					}
+
+					if (!$locked) {
+						fclose($fp);
+						return;
+					}
+				}
+
 				fputs($fp, "[$ts] $msg\n");
+
+				if (function_exists("flock")) {
+					flock($fp, LOCK_UN);
+				}
+
 				fclose($fp);
 			}
 		}
-- 
cgit v1.2.3