From a422a59f991daab9f87c628ad678455909d38622 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 13 Feb 2017 22:49:44 +0100
Subject: [PATCH] Add storage to log item as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
---
lib/private/Files/Storage/Common.php | 36 +++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index f0d0faac2c0..0a0604ddd9c 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -688,7 +688,17 @@ abstract class Common implements Storage, ILockingStorage {
$logger = $this->getLockLogger();
if ($logger) {
$typeString = ($type === ILockingProvider::LOCK_SHARED) ? 'shared' : 'exclusive';
- $logger->info('acquire ' . $typeString . ' lock on ' . $path, ['app' => 'locking']);
+ $logger->info(
+ sprintf(
+ 'acquire %s lock on "%s" on storage "%s"',
+ $typeString,
+ $path,
+ $this->getId()
+ ),
+ [
+ 'app' => 'locking',
+ ]
+ );
}
try {
$provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
@@ -708,7 +718,17 @@ abstract class Common implements Storage, ILockingStorage {
$logger = $this->getLockLogger();
if ($logger) {
$typeString = ($type === ILockingProvider::LOCK_SHARED) ? 'shared' : 'exclusive';
- $logger->info('release ' . $typeString . ' lock on ' . $path, ['app' => 'locking']);
+ $logger->info(
+ sprintf(
+ 'release %s lock on "%s" on storage "%s"',
+ $typeString,
+ $path,
+ $this->getId()
+ ),
+ [
+ 'app' => 'locking',
+ ]
+ );
}
try {
$provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
@@ -728,7 +748,17 @@ abstract class Common implements Storage, ILockingStorage {
$logger = $this->getLockLogger();
if ($logger) {
$typeString = ($type === ILockingProvider::LOCK_SHARED) ? 'shared' : 'exclusive';
- $logger->info('change lock on ' . $path . ' to ' . $typeString, ['app' => 'locking']);
+ $logger->info(
+ sprintf(
+ 'change lock on "%s" to %s on storage "%s"',
+ $path,
+ $typeString,
+ $this->getId()
+ ),
+ [
+ 'app' => 'locking',
+ ]
+ );
}
try {
$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
--
GitLab