🐛 fix clear cache in install tool

pluswerk · Dec 8, 2023 · 4667e16 · 4667e16
1 parent 482f255
commit 4667e16
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Classes/Queue/FileQueue.php b/Classes/Queue/FileQueue.php
@@ -15,7 +15,7 @@ class FileQueue implements QueueInterface
 {
     private string $directory;
 
-    public function __construct(private int $limit, private bool $compress = true)
+    public function __construct(private int $limit = 10000, private bool $compress = true)
     {
         $this->directory = Environment::getVarPath() . '/tx_plussentry_queue/';
         if (!file_exists($this->directory)) {

diff --git a/Classes/Service/Sentry.php b/Classes/Service/Sentry.php
@@ -11,13 +11,13 @@
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
 use Throwable;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 use function Sentry\captureException;
 use function Sentry\configureScope;
-use function Sentry\init;
 use function Sentry\withScope;
 
 class Sentry implements SingletonInterface
@@ -61,7 +61,17 @@ protected function setup(): void
      */
     public static function getInstance(): self
     {
-        return GeneralUtility::makeInstance(Sentry::class);
+        if (GeneralUtility::getContainer()->has(Sentry::class)) {
+            return GeneralUtility::makeInstance(Sentry::class);
+        }
+        return GeneralUtility::makeInstance(
+            Sentry::class,
+            GeneralUtility::makeInstance(ScopeConfig::class),
+            GeneralUtility::makeInstance(
+                ConfigService::class,
+                GeneralUtility::makeInstance(ExtensionConfiguration::class)
+            )
+        );
     }
 
     public function getClient(): ?ClientInterface

diff --git a/Classes/Transport/TransportFactory.php b/Classes/Transport/TransportFactory.php
@@ -4,11 +4,10 @@
 
 namespace Pluswerk\Sentry\Transport;
 
+use Pluswerk\Sentry\Queue\FileQueue;
 use Pluswerk\Sentry\Queue\QueueInterface;
 use Sentry\Options;
-use Sentry\SentrySdk;
 use Sentry\Serializer\PayloadSerializer;
-use Sentry\Serializer\PayloadSerializerInterface;
 use Sentry\Transport\TransportFactoryInterface;
 use Sentry\Transport\TransportInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -17,10 +16,11 @@ class TransportFactory implements TransportFactoryInterface
 {
     public function create(Options $options): TransportInterface
     {
+        $container = GeneralUtility::getContainer();
         return new QueueTransport(
             $options,
             GeneralUtility::makeInstance(PayloadSerializer::class, $options),
-            GeneralUtility::makeInstance(QueueInterface::class)
+            GeneralUtility::makeInstance($container->has(QueueInterface::class) ? QueueInterface::class : FileQueue::class),
         );
     }
 }