first commit
This commit is contained in:
@@ -25,7 +25,7 @@ namespace WapplerSystems\Meilisearch\Report;
|
||||
***************************************************************/
|
||||
|
||||
use WapplerSystems\Meilisearch\ConnectionManager;
|
||||
use WapplerSystems\Meilisearch\System\Solr\SolrConnection;
|
||||
use WapplerSystems\Meilisearch\System\Meilisearch\MeilisearchConnection;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
use TYPO3\CMS\Reports\Status;
|
||||
|
||||
@@ -35,7 +35,7 @@ use TYPO3\CMS\Reports\Status;
|
||||
*
|
||||
* @author Ingo Renner <ingo@typo3.org>
|
||||
*/
|
||||
class SchemaStatus extends AbstractSolrStatus
|
||||
class SchemaStatus extends AbstractMeilisearchStatus
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -53,7 +53,7 @@ class SchemaStatus extends AbstractSolrStatus
|
||||
|
||||
/**
|
||||
* Compiles a collection of schema version checks against each configured
|
||||
* Solr server. Only adds an entry if a schema other than the
|
||||
* Meilisearch server. Only adds an entry if a schema other than the
|
||||
* recommended one was found.
|
||||
*
|
||||
*/
|
||||
@@ -62,17 +62,17 @@ class SchemaStatus extends AbstractSolrStatus
|
||||
$reports = [];
|
||||
/** @var $connectionManager ConnectionManager */
|
||||
$connectionManager = GeneralUtility::makeInstance(ConnectionManager::class);
|
||||
$solrConnections = $connectionManager->getAllConnections();
|
||||
$meilisearchConnections = $connectionManager->getAllConnections();
|
||||
|
||||
foreach ($solrConnections as $solrConnection) {
|
||||
$adminService = $solrConnection->getAdminService();
|
||||
/** @var $solrConnection SolrConnection */
|
||||
foreach ($meilisearchConnections as $meilisearchConnection) {
|
||||
$adminService = $meilisearchConnection->getAdminService();
|
||||
/** @var $meilisearchConnection MeilisearchConnection */
|
||||
if (!$adminService->ping()) {
|
||||
$url = $adminService->__toString();
|
||||
$pingFailedMsg = 'Could not ping solr server, can not check version ' . (string)$url;
|
||||
$pingFailedMsg = 'Could not ping meilisearch server, can not check version ' . (string)$url;
|
||||
$status = GeneralUtility::makeInstance(
|
||||
Status::class,
|
||||
/** @scrutinizer ignore-type */ 'Apache Solr Version',
|
||||
/** @scrutinizer ignore-type */ 'Meilisearch Version',
|
||||
/** @scrutinizer ignore-type */ 'Not accessible',
|
||||
/** @scrutinizer ignore-type */ $pingFailedMsg,
|
||||
/** @scrutinizer ignore-type */ Status::ERROR
|
||||
@@ -83,7 +83,7 @@ class SchemaStatus extends AbstractSolrStatus
|
||||
|
||||
$isWrongSchema = $adminService->getSchema()->getName() != self::RECOMMENDED_SCHEMA_VERSION;
|
||||
if ($isWrongSchema) {
|
||||
$variables = ['solr' => $adminService, 'recommendedVersion' => self::RECOMMENDED_SCHEMA_VERSION];
|
||||
$variables = ['meilisearch' => $adminService, 'recommendedVersion' => self::RECOMMENDED_SCHEMA_VERSION];
|
||||
$report = $this->getRenderedReport('SchemaStatus.html', $variables);
|
||||
$status = GeneralUtility::makeInstance(
|
||||
Status::class,
|
||||
|
Reference in New Issue
Block a user