Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ setup:
start:
@echo "🐳 Starting all services..."
docker-compose up -d --build
@docker-compose exec -d notification-service php bin/console messenger:consume async

## run listener
rabbit-listen:
Expand Down
6 changes: 5 additions & 1 deletion services/notification-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ RUN composer install --no-interaction --prefer-dist --no-scripts || true

RUN chown -R www-data:www-data /var/www/html

# Copy startup script
COPY start.sh /start.sh
RUN chmod +x /start.sh

EXPOSE 9000

CMD ["php-fpm", "-F", "-R"]
CMD ["/start.sh"]
81 changes: 58 additions & 23 deletions services/notification-service/config/packages/monolog.yaml
Original file line number Diff line number Diff line change
@@ -1,28 +1,63 @@
monolog:
channels:
- messenger
- deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists

handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!messenger"]
when@dev:
monolog:
handlers:
main:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
channels: ["!event"]
# uncomment to get logging in your browser
# you may have to allow bigger header sizes in your Web server configuration
#firephp:
# type: firephp
# level: info
#chromephp:
# type: chromephp
# level: info
console:
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine", "!console"]

nested:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
when@test:
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!event"]
nested:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug

console:
type: console
process_psr_3_messages: false
channels: ["!messenger", "!event"]

# Логи Messenger в отдельный файл
messenger:
type: stream
path: "%kernel.logs_dir%/messenger.%kernel.environment%.log"
level: debug
channels: [messenger]
when@prod:
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!deprecation"]
buffer_size: 50 # How many messages should be saved? Prevent memory leaks
nested:
type: stream
path: php://stderr
level: debug
formatter: monolog.formatter.json
console:
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine"]
deprecation:
type: stream
channels: [deprecation]
path: php://stderr
formatter: monolog.formatter.json
28 changes: 28 additions & 0 deletions services/notification-service/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh

echo "🚀 Starting Notification Service..."

# Ждем пока RabbitMQ будет готов (без netcat)
echo "🐰 Waiting for RabbitMQ to be ready..."
while true; do
if php -r "\$c = @fsockopen('rabbitmq', 5672); if (\$c) { fclose(\$c); exit(0); } exit(1);"; then
echo "✅ RabbitMQ is ready!"
break
fi
echo "Waiting for RabbitMQ..."
sleep 2
done

# Запускаем PHP-FPM в фоне (для веб-запросов через nginx)
echo "📡 Starting PHP-FPM..."
php-fpm -F -R &

# Ждем немного чтобы PHP-FPM запустился
sleep 3

# Запускаем Messenger worker (блокирующая команда)
echo "🔄 Starting Messenger worker..."
php bin/console messenger:consume async -vv > /var/www/html/var/log/messenger.log 2>&1

# Если worker упадет, контейнер завершится
echo "❌ Messenger worker stopped"
2 changes: 1 addition & 1 deletion services/notification-service/symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "3.7",
"ref": "aff23899c4440dd995907613c1dd709b6f59503f"
"ref": "f5f5f3e4c23f5349796b7de587f19c51e7104299"
},
"files": [
"config/packages/monolog.yaml"
Expand Down
1 change: 1 addition & 0 deletions services/user-service/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"symfony/flex": "^2.8.2",
"symfony/framework-bundle": "7.3.*",
"symfony/messenger": "7.3.*",
"symfony/monolog-bundle": "^3.10",
"symfony/property-access": "7.3.*",
"symfony/property-info": "7.3.*",
"symfony/runtime": "7.3.*",
Expand Down
1 change: 1 addition & 0 deletions services/user-service/config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
];
63 changes: 63 additions & 0 deletions services/user-service/config/packages/monolog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
monolog:
channels:
- deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists

when@dev:
monolog:
handlers:
main:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
channels: ["!event"]
# uncomment to get logging in your browser
# you may have to allow bigger header sizes in your Web server configuration
#firephp:
# type: firephp
# level: info
#chromephp:
# type: chromephp
# level: info
console:
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine", "!console"]

when@test:
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!event"]
nested:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug

when@prod:
monolog:
handlers:
main:
type: fingers_crossed
action_level: error
handler: nested
excluded_http_codes: [404, 405]
channels: ["!deprecation"]
buffer_size: 50 # How many messages should be saved? Prevent memory leaks
nested:
type: stream
path: php://stderr
level: debug
formatter: monolog.formatter.json
console:
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine"]
deprecation:
type: stream
channels: [deprecation]
path: php://stderr
formatter: monolog.formatter.json
12 changes: 12 additions & 0 deletions services/user-service/symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,18 @@
"config/packages/messenger.yaml"
]
},
"symfony/monolog-bundle": {
"version": "3.10",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "3.7",
"ref": "f5f5f3e4c23f5349796b7de587f19c51e7104299"
},
"files": [
"config/packages/monolog.yaml"
]
},
"symfony/property-info": {
"version": "7.3",
"recipe": {
Expand Down
Loading