aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2024-06-28 08:45:40 +0200
committerGitHub <noreply@github.com>2024-06-28 08:45:40 +0200
commit8abf72b4735fd9d00c31136dace67a7fbb0ecddf (patch)
tree759ead8b33e841f30e06588a5584eb9c8502ab7e
parent79721b48e526e9cdd74827d8277ef32ad1dc3ebf (diff)
parent92fce667508abc5ac6a744094b41a315cd85eb85 (diff)
downloadnextcloud-server-8abf72b4735fd9d00c31136dace67a7fbb0ecddf.tar.gz
nextcloud-server-8abf72b4735fd9d00c31136dace67a7fbb0ecddf.zip
Merge pull request #45843 from nextcloud/backport/45530/stable29
[stable29] fix(cron): Log excess memory usage at debug and info levels
-rw-r--r--cron.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/cron.php b/cron.php
index 537201c1c28..4126200cc8e 100644
--- a/cron.php
+++ b/cron.php
@@ -197,10 +197,10 @@ try {
);
}
- if ($memoryAfter - $memoryBefore > 10_000_000) {
- $logger->warning('Used memory grew by more than 10 MB when executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryAfter). ' (before: ' . Util::humanFileSize($memoryBefore) . ')', ['app' => 'cron']);
+ if ($memoryAfter - $memoryBefore > 50_000_000) {
+ $logger->warning('Used memory grew by more than 50 MB when executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryAfter). ' (before: ' . Util::humanFileSize($memoryBefore) . ')', ['app' => 'cron']);
}
- if ($memoryPeakAfter > 300_000_000) {
+ if ($memoryPeakAfter > 300_000_000 && $memoryPeakBefore <= 300_000_000) {
$logger->warning('Cron job used more than 300 MB of ram after executing job ' . $jobDetails . ': ' . Util::humanFileSize($memoryPeakAfter) . ' (before: ' . Util::humanFileSize($memoryPeakBefore) . ')', ['app' => 'cron']);
}