summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-03-01 12:33:37 +0100
committerAndrey Andreev <narf@devilix.net>2016-03-01 12:33:37 +0100
commite1f36e341a4ff513f8ba1f9908326f159edca4e7 (patch)
tree1e28f2741b2dfdcbc090e8a19ca890fb8f64e4c8
parente0b11e9a57f1fa3ef8b0d8ee7cef640aa5cc0eef (diff)
[ci skip] Move flock() call in CI_Log::write_log() immediately after fopen()
-rw-r--r--system/core/Log.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Log.php b/system/core/Log.php
index 7c81d358b..1abdaa00e 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -191,6 +191,8 @@ class CI_Log {
return FALSE;
}
+ flock($fp, LOCK_EX);
+
// Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
if (strpos($this->_date_fmt, 'u') !== FALSE)
{
@@ -206,8 +208,6 @@ class CI_Log {
$message .= $this->_format_line($level, $date, $msg);
- flock($fp, LOCK_EX);
-
for ($written = 0, $length = strlen($message); $written < $length; $written += $result)
{
if (($result = fwrite($fp, substr($message, $written))) === FALSE)