first commit
This commit is contained in:
@@ -29,7 +29,7 @@ namespace WapplerSystems\Meilisearch\IndexQueue\Initializer;
|
||||
|
||||
use WapplerSystems\Meilisearch\Domain\Index\Queue\QueueItemRepository;
|
||||
use WapplerSystems\Meilisearch\Domain\Site\Site;
|
||||
use WapplerSystems\Meilisearch\System\Logging\SolrLogManager;
|
||||
use WapplerSystems\Meilisearch\System\Logging\MeilisearchLogManager;
|
||||
use Doctrine\DBAL\DBALException;
|
||||
use TYPO3\CMS\Backend\Utility\BackendUtility;
|
||||
use TYPO3\CMS\Core\Database\ConnectionPool;
|
||||
@@ -81,7 +81,7 @@ abstract class AbstractInitializer implements IndexQueueInitializer
|
||||
protected $flashMessageQueue;
|
||||
|
||||
/**
|
||||
* @var \WapplerSystems\Meilisearch\System\Logging\SolrLogManager
|
||||
* @var \WapplerSystems\Meilisearch\System\Logging\MeilisearchLogManager
|
||||
*/
|
||||
protected $logger = null;
|
||||
|
||||
@@ -96,9 +96,9 @@ abstract class AbstractInitializer implements IndexQueueInitializer
|
||||
*/
|
||||
public function __construct(QueueItemRepository $queueItemRepository = null)
|
||||
{
|
||||
$this->logger = GeneralUtility::makeInstance(SolrLogManager::class, /** @scrutinizer ignore-type */ __CLASS__);
|
||||
$this->logger = GeneralUtility::makeInstance(MeilisearchLogManager::class, /** @scrutinizer ignore-type */ __CLASS__);
|
||||
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
|
||||
$this->flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier('solr.queue.initializer');
|
||||
$this->flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier('meilisearch.queue.initializer');
|
||||
$this->queueItemRepository = $queueItemRepository ?? GeneralUtility::makeInstance(QueueItemRepository::class);
|
||||
}
|
||||
|
||||
@@ -388,11 +388,11 @@ abstract class AbstractInitializer implements IndexQueueInitializer
|
||||
*/
|
||||
protected function logInitialization(array $logData)
|
||||
{
|
||||
if (!$this->site->getSolrConfiguration()->getLoggingIndexingIndexQueueInitialization()) {
|
||||
if (!$this->site->getMeilisearchConfiguration()->getLoggingIndexingIndexQueueInitialization()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$logSeverity = isset($logData['error']) ? SolrLogManager::ERROR : SolrLogManager::NOTICE;
|
||||
$logSeverity = isset($logData['error']) ? MeilisearchLogManager::ERROR : MeilisearchLogManager::NOTICE;
|
||||
$logData = array_merge($logData, [
|
||||
'site' => $this->site->getLabel(),
|
||||
'indexing configuration name' => $this->indexingConfigurationName,
|
||||
|
@@ -31,7 +31,7 @@ use WapplerSystems\Meilisearch\Domain\Index\Queue\QueueItemRepository;
|
||||
use WapplerSystems\Meilisearch\Domain\Site\SiteRepository;
|
||||
use WapplerSystems\Meilisearch\IndexQueue\Item;
|
||||
use WapplerSystems\Meilisearch\IndexQueue\Queue;
|
||||
use WapplerSystems\Meilisearch\System\Logging\SolrLogManager;
|
||||
use WapplerSystems\Meilisearch\System\Logging\MeilisearchLogManager;
|
||||
use WapplerSystems\Meilisearch\System\Records\Pages\PagesRepository;
|
||||
use Doctrine\DBAL\DBALException;
|
||||
use TYPO3\CMS\Backend\Utility\BackendUtility;
|
||||
@@ -167,7 +167,7 @@ class Page extends AbstractInitializer
|
||||
$databaseConnection->rollBack();
|
||||
|
||||
$this->logger->log(
|
||||
SolrLogManager::ERROR,
|
||||
MeilisearchLogManager::ERROR,
|
||||
'Index Queue initialization failed for mount pages',
|
||||
[
|
||||
$e->__toString()
|
||||
|
Reference in New Issue
Block a user