Skip to content

Commit

Permalink
PAYOSWXP-120: notification forwarding: use correct logger registration
Browse files Browse the repository at this point in the history
  • Loading branch information
rommelfreddy committed Feb 19, 2024
1 parent d8108e1 commit fecf68e
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 20 deletions.
18 changes: 0 additions & 18 deletions src/DependencyInjection/logger.xml

This file was deleted.

7 changes: 6 additions & 1 deletion src/DependencyInjection/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<import resource="webhooks.xml"/>
<import resource="requestParameter/*.xml"/>
<import resource="payment_method_filter.xml"/>
<import resource="logger.xml"/>
</imports>

<parameters>
Expand Down Expand Up @@ -67,6 +66,12 @@
</service>
<service id="PayonePayment\Payone\Client\PayoneClientInterface" alias="PayonePayment\Payone\Client\PayoneClient"/>

<service id="PayonePayment\Util\Logger" class="Monolog\Logger">
<factory service="Shopware\Core\Framework\Log\LoggerFactory" method="createRotating"/>

<argument type="string">payone_payment</argument>
</service>

<service id="payone.app_system.guzzle" class="GuzzleHttp\Client">
</service>

Expand Down
3 changes: 2 additions & 1 deletion src/DependencyInjection/webhooks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@

<service id="PayonePayment\Payone\Webhook\MessageBus\MessageHandler\NotificationForwardHandler">
<argument type="service" id="payone_payment_notification_forward.repository" />
<argument type="service" id="PayonePayment\Util\NotificationForwardLogger" />
<argument key="$logger" type="service" id="monolog.logger.payone_transaction_forward" />

<tag name="messenger.message_handler"/>
</service>
</services>
Expand Down
18 changes: 18 additions & 0 deletions src/PayonePayment.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@
use Shopware\Core\Framework\Plugin\Util\PluginIdProvider;
use Shopware\Core\System\SystemConfig\SystemConfigService;
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\ContainerInterface;
use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

class PayonePayment extends Plugin
{
Expand All @@ -33,6 +38,19 @@ public function build(ContainerBuilder $container): void
$loader->load('services.xml');

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 install(InstallContext $installContext): void
Expand Down
9 changes: 9 additions & 0 deletions src/Resources/config/packages/monolog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
monolog:
channels: [ "payone_transaction_forward" ]

handlers:
payoneTransactionForwardLogger:
type: rotating_file
path: "%kernel.logs_dir%/payone_transaction_forward.log"
level: info
channels: [ "payone_transaction_forward" ]

0 comments on commit fecf68e

Please sign in to comment.