From b828029444b6fda4c139a0f7a19c6a89ec689249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCller?= <typo3@t3node.com>
Date: Sat, 11 Jan 2014 12:14:41 +0100
Subject: [PATCH] [BUGFIX] Add missing logger names
A logger name is mandatory to configure a particular logger.
The convention is use __CLASS__ as the logger name when
instanciating a new logger using LogManager->getLogger().
Resolves: #54909
Releases: 6.2, 6.1
Change-Id: I5dbda770ec92fd75c3aff9ed89c68c5666669b07
Reviewed-on: https://review.typo3.org/26754
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
---
.../Classes/ContentObject/ContentObjectRenderer.php | 4 ++--
.../frontend/Classes/ContentObject/FilesContentObject.php | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 3a5a90e39e3d..ba3b5a0c91a6 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -5265,7 +5265,7 @@ class ContentObjectRenderer {
}
} catch(\TYPO3\CMS\Core\Resource\Exception $exception) {
/** @var \TYPO3\CMS\Core\Log\Logger $logger */
- $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger();
+ $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
$logger->warning('The image "' . $file . '" could not be found and won\'t be included in frontend output');
return NULL;
}
@@ -5543,7 +5543,7 @@ class ContentObjectRenderer {
}
} catch (\TYPO3\CMS\Core\Resource\Exception $exception) {
/** @var \TYPO3\CMS\Core\Log\Logger $logger */
- $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger();
+ $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
$logger->warning('The file "' . $fileUidOrCurrentKeyword . '" could not be found and won\'t be included in frontend output');
$fileObject = NULL;
}
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FilesContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FilesContentObject.php
index 5d0e4822e515..6b740996b1a9 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FilesContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FilesContentObject.php
@@ -78,7 +78,7 @@ class FilesContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
$this->addToArray($this->getFileRepository()->findFileReferenceByUid($referenceUid), $fileObjects);
} catch (\TYPO3\CMS\Core\Resource\Exception $e) {
/** @var \TYPO3\CMS\Core\Log\Logger $logger */
- $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger();
+ $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
$logger->warning('The file-reference with uid "' . $referenceUid . '" could not be found and won\'t be included in frontend output');
}
}
@@ -110,7 +110,7 @@ class FilesContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
$this->addToArray($this->getFileRepository()->findByUid($fileUid), $fileObjects);
} catch (\TYPO3\CMS\Core\Resource\Exception $e) {
/** @var \TYPO3\CMS\Core\Log\Logger $logger */
- $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger();
+ $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
$logger->warning('The file with uid "' . $fileUid . '" could not be found and won\'t be included in frontend output');
}
}
@@ -126,7 +126,7 @@ class FilesContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
}
} catch (\TYPO3\CMS\Core\Resource\Exception $e) {
/** @var \TYPO3\CMS\Core\Log\Logger $logger */
- $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger();
+ $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
$logger->warning('The file-collection with uid "' . $collectionUid . '" could not be found or contents could not be loaded and won\'t be included in frontend output');
}
}
@@ -142,7 +142,7 @@ class FilesContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
}
} catch (\TYPO3\CMS\Core\Resource\Exception $e) {
/** @var \TYPO3\CMS\Core\Log\Logger $logger */
- $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger();
+ $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
$logger->warning('The folder with identifier "' . $folderIdentifier . '" could not be found and won\'t be included in frontend output');
}
}
--
GitLab