hotifx for logger

mondu-ai · Apr 24, 2024 · ed43e3c · ed43e3c
1 parent 856e467
commit ed43e3c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 37 deletions.
diff --git a/src/Components/StateMachine/DependencyInjection/subscriber.xml b/src/Components/StateMachine/DependencyInjection/subscriber.xml
@@ -15,7 +15,7 @@
             <argument key="$monduClient" type="service" id="mondu.mondu_api"/>
             <argument key="$orderDataRepository" type="service" id="mondu_order_data.repository"/>
             <argument key="$invoiceDataRepository" type="service" id="mondu_invoice_data.repository"/>
-            <argument key="$logger" type="service" id="mondu.logger"/>
+            <argument key="$logger" type="service" id="monolog.logger.mondu"/>
             <argument key="$currencyRepository" id="currency.repository" type="service" />
         </service>
 

diff --git a/src/Components/StateMachine/Service/StateMachineRegistryDecorator.php b/src/Components/StateMachine/Service/StateMachineRegistryDecorator.php
@@ -49,7 +49,7 @@ public function transition(Transition $transition, Context $context): StateMachi
                 if (!$this->configService->skipOrderStateValidation()) {
 
                     if ($transitionName == 'reopen' && !$this->canCancelOrder($order)) {
-                        throw new MonduException('Order was canceled.');
+//                        throw new MonduException('Order was canceled.');
                     }
 
                     if ($transitionName == 'ship' || $transitionName == 'ship_partially') {

diff --git a/src/Components/StateMachine/Subscriber/TransitionSubscriber.php b/src/Components/StateMachine/Subscriber/TransitionSubscriber.php
@@ -41,7 +41,9 @@ public function __construct(
         private readonly DocumentUrlHelper $documentUrlHelper,
         private readonly LoggerInterface $logger,
         private readonly EntityRepository $currencyRepository
-    ) {}
+    ) {
+
+    }
 
     public static function getSubscribedEvents(): array
     {

diff --git a/src/Components/Webhooks/DependencyInjection/services.xml b/src/Components/Webhooks/DependencyInjection/services.xml
@@ -6,7 +6,7 @@
         <defaults autowire="true"/>
 
         <service id="mondu.webhook_service" class="Mondu\MonduPayment\Components\Webhooks\Service\WebhookService">
-          <argument key="$logger" type="service" id="mondu.logger"/>
+          <argument key="$logger" type="service" id="monolog.logger.mondu"/>
           <argument key="$monduClient" type="service" id="mondu.mondu_api"/>
           <argument key="$orderDataRepository" type="service" id="mondu_order_data.repository"/>
           <argument key="$configService" type="service" id="mondu.mondu_config"/>

diff --git a/src/Mond1SW6.php b/src/Mond1SW6.php
@@ -15,6 +15,15 @@
 use Shopware\Core\Framework\Plugin\Context\ActivateContext;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\DelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
+use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+
 class Mond1SW6 extends Plugin
 {
     public function install(InstallContext $installContext): void
@@ -45,6 +54,24 @@ public function activate(ActivateContext $activateContext): void
         }
     }
 
+    public function build(ContainerBuilder $container): void
+    {
+        parent::build($container);
+
+        $locator = new FileLocator('Resources/config');
+
+        $resolver = new LoaderResolver([
+            new YamlFileLoader($container, $locator),
+            new GlobFileLoader($container, $locator),
+            new DirectoryLoader($container, $locator),
+        ]);
+
+        $configLoader = new DelegatingLoader($resolver);
+
+        $confDir = \rtrim($this->getPath(), '/') . '/Resources/config';
+        $configLoader->load($confDir . '/{packages}/*.yaml', 'glob');
+    }
+
     public function update(UpdateContext $updateContext): void
     {
         parent::update($updateContext);

diff --git a/src/Pos/Run/LoggerFactory.php b/src/Pos/Run/LoggerFactory.php
diff --git a/src/Resources/config/packages/monolog.yaml b/src/Resources/config/packages/monolog.yaml
@@ -0,0 +1,9 @@
+monolog:
+  channels: ['mondu']
+
+  handlers:
+    monduLogHandler:
+      type: rotating_file
+      path: "%kernel.logs_dir%/mondu_%kernel.environment%.log"
+      level: error
+      channels: [ "mondu" ]
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -52,7 +52,7 @@
 
         <service id="mondu.mondu_api" class="Mondu\MonduPayment\Components\MonduApi\Service\MonduClient" public="true">
             <argument type="service" id="mondu.mondu_config"/>
-            <argument key="$logger" type="service" id="mondu.logger"/>
+            <argument key="$logger" type="service" id="monolog.logger.mondu"/>
         </service>
 
         <service id="Mondu\MonduPayment\Components\MonduApi\Service\MonduOperationService">
@@ -85,7 +85,7 @@
             <argument key="$orderDataRepository" type="service" id="mondu_order_data.repository"/>
             <argument key="$invoiceDataRepository" type="service" id="mondu_invoice_data.repository"/>
             <argument key="$monduClient" type="service" id="mondu.mondu_api"/>
-            <argument key="$logger" type="service" id="mondu.logger"/>
+            <argument key="$logger" type="service" id="monolog.logger.mondu"/>
             <argument key="$productRepository" type="service" id="product.repository"/>
             <argument key="$currencyRepository" type="service" id="currency.repository"/>
         </service>
@@ -96,21 +96,14 @@
             <argument key="$orderDataRepository" type="service" id="mondu_order_data.repository"/>
             <argument key="$invoiceDataRepository" type="service" id="mondu_invoice_data.repository"/>
             <argument key="$monduClient" type="service" id="mondu.mondu_api"/>
-            <argument key="$logger" type="service" id="mondu.logger"/>
+            <argument key="$logger" type="service" id="monolog.logger.mondu"/>
         </service>
 
         <service id="Mondu\MonduPayment\Bootstrap\MediaProvider" public="true">
             <argument type="service" key="$mediaService" id="Shopware\Core\Content\Media\MediaService"/>
             <argument type="service" key="$mediaRepository" id="media.repository"/>
         </service>
 
-        <service id="Mondu\MonduPayment\Pos\Run\LoggerFactory"/>
-
-        <service id="mondu.logger" class="Monolog\Logger">
-            <factory service="Mondu\MonduPayment\Pos\Run\LoggerFactory" method="createLogger"/>
-            <argument type="string">mondu_payment</argument>
-        </service>
-
         <service id="Mondu\MonduPayment\Command\ConfigApiTokenCommand">
             <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>
             <tag name="console.command"/>