summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-07-06 17:29:45 -0400
committerMichael Gapczynski <mtgap@owncloud.com>2012-07-06 17:29:45 -0400
commitf955e5e9b2ed03137f6c5a264a97500be9107bbe (patch)
tree62a5ca11f9a2cde0a7e98970f6b2d56c2ac2b26b /lib
parent90e4af312a68049d08d7701e069143387613545a (diff)
downloadnextcloud-server-f955e5e9b2ed03137f6c5a264a97500be9107bbe.tar.gz
nextcloud-server-f955e5e9b2ed03137f6c5a264a97500be9107bbe.zip
Move line counter so we only count lines towards the offset that are equal or above the log level
Diffstat (limited to 'lib')
-rw-r--r--lib/log/owncloud.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 42ae7867ff0..9eb21832c55 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -80,12 +80,14 @@ class OC_Log_Owncloud {
if ($pos == 0) {
$line = $ch.$line;
}
- $lines++;
$entry = json_decode($line);
// Add the line as an entry if it is passed the offset and is equal or above the log level
- if ($lines > $offset && $entry->level >= $minLevel) {
- $entries[] = $entry;
- $entriesCount++;
+ if ($entry->level >= $minLevel) {
+ $lines++;
+ if ($lines > $offset) {
+ $entries[] = $entry;
+ $entriesCount++;
+ }
}
$line = '';
}