Skip to content

Commit

Permalink
IBX-3921: Removed prepended Solarium Solr configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
barw4 authored Oct 3, 2022
1 parent 447418d commit c0a831a
Showing 1 changed file with 0 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ private function configureGenericSetup(ContainerBuilder $container): void
$container->setParameter('solr_dsn', '%env(SOLR_DSN)%');
$container->setParameter('solr_core', '%env(SOLR_CORE)%');

$container->setParameter('siso_search.solr.host', '%env(SISO_SEARCH_SOLR_HOST)%');
$container->setParameter('siso_search.solr.port', '%env(SISO_SEARCH_SOLR_PORT)%');
$container->setParameter('siso_search.solr.core', '%env(SISO_SEARCH_SOLR_CORE)%');
$container->setParameter('siso_search.solr.path', '%env(SISO_SEARCH_SOLR_PATH)%');

$projectDir = $container->getParameter('kernel.project_dir');

if ($dfsNfsPath = $_SERVER['DFS_NFS_PATH'] ?? false) {
Expand Down Expand Up @@ -286,20 +281,6 @@ private function configurePlatformShSetup(ContainerBuilder $container): void
$container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr'));
// To set solr_core parameter we assume path is in form like: "solr/collection1"
$container->setParameter('solr_core', substr($endpoint['path'], 5));

// Ibexa DXP Commerce needs special treatment due to Solarium use
// @todo Remove this once Commerce is fully rewritten
$bundles = $container->getParameter('kernel.bundles');

if (isset($bundles['SisoSearchBundle'])) {
$container->setParameter('solr_dsn', sprintf('http://%s:%d', $endpoint['host'], $endpoint['port']));
// To set solr_core parameter we assume path is in form like: "solr/collection1"
$container->setParameter('solr_core', substr($endpoint['path'], 5));

$container->setParameter('siso_search.solr.host', $endpoint['host']);
$container->setParameter('siso_search.solr.port', $endpoint['port']);
$container->setParameter('siso_search.solr.core', $endpoint['rel']);
}
}
}

Expand Down

0 comments on commit c0a831a

Please sign in to comment.