Merge pull request #18 from terratensor/15-q1-not-found

15 q1 not found

consumer/internal/infra/msgreceiver/msgreceiver.go

@@ -13,16 +13,15 @@ import (
 	"gocloud.dev/pubsub"
 )
 
-func Run(ctx context.Context, chout chan msghandler.Request, wg *sync.WaitGroup) {
+func Run(ctx context.Context, chout chan msghandler.Request, wg *sync.WaitGroup) error {
 	defer wg.Done()
 
 	// pubsub.OpenSubscription creates a *pubsub.Subscription from a URL.
 	// This URL will Dial the RabbitMQ server at the URL in the environment
 	// variable RABBIT_SERVER_URL and open the queue "myqueue".
 	subs, err := pubsub.OpenSubscription(ctx, os.Getenv("Q1"))
 	if err != nil {
-		sentry.CaptureMessage(fmt.Sprint(err))
-		log.Panic(err)
+		return err
 	}
 
 	defer func(subs *pubsub.Subscription, ctx context.Context) {
@@ -36,9 +35,8 @@ func Run(ctx context.Context, chout chan msghandler.Request, wg *sync.WaitGroup)
 	for {
 		msg, err := subs.Receive(ctx)
 		if err != nil {
-			sentry.CaptureMessage(fmt.Sprint(err))
 			log.Printf("Receiving message: %v", err)
-			break
+			return err
 		}
 		select {
 		case <-ctx.Done():

consumer/main.go

@@ -21,31 +21,48 @@ func main() {
 
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
 
-	contents, err := os.ReadFile(os.Getenv("SENTRY_DSN_FILE"))
-	if err != nil {
-		log.Fatalf("can not read SENTRY_DSN_FILE")
-	}
-	dsn := fmt.Sprintf("%v", strings.Trim(string(contents), "\r\n"))
-
-	err = sentry.Init(sentry.ClientOptions{
-		Dsn: dsn,
-		// Set TracesSampleRate to 1.0 to capture 100%
-		// of transactions for performance monitoring.
-		// We recommend adjusting this value in production,
-		TracesSampleRate: 1.0,
-	})
-	if err != nil {
-		log.Fatalf("sentry.Init: %s", err)
+	mode := os.Getenv("APP_ENV")
+
+	if mode == "prod" {
+		contents, err := os.ReadFile(os.Getenv("SENTRY_DSN_FILE"))
+		if err != nil {
+			log.Fatalf("can not read SENTRY_DSN_FILE")
+		}
+		dsn := fmt.Sprintf("%v", strings.Trim(string(contents), "\r\n"))
+
+		err = sentry.Init(sentry.ClientOptions{
+			Dsn: dsn,
+			// Set TracesSampleRate to 1.0 to capture 100%
+			// of transactions for performance monitoring.
+			// We recommend adjusting this value in production,
+			TracesSampleRate: 1.0,
+		})
+		if err != nil {
+			log.Fatalf("sentry.Init: %s", err)
+		}
 	}
 
 	ch := make(chan msghandler.Request, 100)
 	wg := &sync.WaitGroup{}
 	wg.Add(2)
-	go msgreceiver.Run(ctx, ch, wg)
+
+	go func() {
+		err := msgreceiver.Run(ctx, ch, wg)
+		// Обрабатываем ошибку и выходим с кодом 1, для того чтобы инициировать перезапуск докер контейнера.
+		// Возможно тут имеет смысл сделать сервис проверки health, но пока так
+		if err != nil {
+			log.Printf("%v\r\n failure, restart required", err)
+			sentry.CaptureMessage(fmt.Sprint(err))
+			os.Exit(1)
+		}
+	}()
+
 	go msghandler.Handler(ctx, ch, wg)
 
-	// Flush buffered events before the program terminates.
-	defer sentry.Flush(2 * time.Second)
+	if mode == "PROD" {
+		// Flush buffered events before the program terminates.
+		defer sentry.Flush(2 * time.Second)
+	}
 
 	wg.Wait()
 	stop()

docker-compose-production.yml

@@ -13,6 +13,7 @@ services:
       - rmq-net
       - tg-bot-net
     environment:
+      APP_ENV: prod
       RABBIT_SERVER_URL: amqp://rmq
       RABBIT_EXCHANGE_NAME: ex1
       TG_CHAT_ID: "@svoddru"
@@ -28,9 +29,6 @@ services:
         constraints: [ node.role == manager ]
       restart_policy:
         condition: on-failure
-        delay: 10s
-        max_attempts: 100
-        window: 120s
 
 secrets:
   tg_bot_token:

docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - rmq-net
       - tg-bot-net
     environment:
+      APP_ENV: dev
       RABBIT_SERVER_URL: amqp://rmq
       RABBIT_EXCHANGE_NAME: ex1
       TG_CHAT_ID: "-1001700331408"
@@ -35,9 +36,6 @@ services:
     deploy:
       restart_policy:
         condition: on-failure
-        delay: 10s
-        max_attempts: 100
-        window: 120s
 
 secrets:
   tg_bot_token: