refactor(examples): use correct ec

alebabai · May 9, 2024 · 40573d2 · 40573d2
1 parent c0c6938
commit 40573d2
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 23 deletions.
diff --git a/examples/confluent/cmd/consumer/main.go b/examples/confluent/cmd/consumer/main.go
@@ -55,10 +55,9 @@ func main() {
 		}
 
 		c, err := ckafka.NewConsumer(&ckafka.ConfigMap{
-			"bootstrap.servers":        brokerAddr,
-			"group.id":                 consumer.KafkaGroupID,
-			"enable.auto.commit":       true,
-			"allow.auto.create.topics": true,
+			"bootstrap.servers":  brokerAddr,
+			"group.id":           consumer.KafkaGroupID,
+			"enable.auto.commit": true,
 		})
 		if err != nil {
 			fatal(logger, fmt.Errorf("failed to init kafka consumer: %w", err))
@@ -119,17 +118,24 @@ func main() {
 		}
 	}()
 
+	sigc := make(chan os.Signal, 1)
+
 	go func() {
 		sigc := make(chan os.Signal, 1)
 		signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
-		errc <- fmt.Errorf("%s", <-sigc)
 	}()
 
 	_ = logger.Log("msg", "application started")
-	_ = logger.Log("msg", "application stopped", "exit", <-errc)
+
+	select {
+	case sig := <-sigc:
+		_ = logger.Log("msg", "application stopped", "exit", sig)
+	case err := <-errc:
+		fatal(logger, err)
+	}
 }
 
 func fatal(logger log.Logger, err error) {
-	_ = level.Error(logger).Log("err", err)
+	_ = level.Error(logger).Log("msg", "application stopped by an error", "err", err)
 	os.Exit(1)
 }
diff --git a/examples/confluent/cmd/producer/main.go b/examples/confluent/cmd/producer/main.go
@@ -104,17 +104,23 @@ func main() {
 		}
 	}()
 
+	sigc := make(chan os.Signal, 1)
+
 	go func() {
-		sigc := make(chan os.Signal, 1)
 		signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
-		errc <- fmt.Errorf("%s", <-sigc)
 	}()
 
 	_ = logger.Log("msg", "application started")
-	_ = logger.Log("msg", "application stopped", "exit", <-errc)
+
+	select {
+	case sig := <-sigc:
+		_ = logger.Log("msg", "application stopped", "exit", sig)
+	case err := <-errc:
+		fatal(logger, err)
+	}
 }
 
 func fatal(logger log.Logger, err error) {
-	_ = logger.Log("err", err)
+	_ = level.Error(logger).Log("msg", "application stopped by an error", "err", err)
 	os.Exit(1)
 }
diff --git a/examples/confluent/compose.yml b/examples/confluent/compose.yml
@@ -28,7 +28,7 @@ services:
 
   consumer:
     image: library/golang:1.22
-    restart: always
+    restart: on-failure
     depends_on:
       - kafka
     environment:
@@ -42,7 +42,7 @@ services:
 
   producer:
     image: library/golang:1.22
-    restart: always
+    restart: on-failure
     depends_on:
       - kafka
     environment:

diff --git a/examples/sarama/cmd/consumer/main.go b/examples/sarama/cmd/consumer/main.go
@@ -136,17 +136,23 @@ func main() {
 		}
 	}()
 
+	sigc := make(chan os.Signal, 1)
+
 	go func() {
-		sigc := make(chan os.Signal, 1)
 		signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
-		errc <- fmt.Errorf("%s", <-sigc)
 	}()
 
 	_ = logger.Log("msg", "application started")
-	_ = logger.Log("msg", "application stopped", "exit", <-errc)
+
+	select {
+	case sig := <-sigc:
+		_ = logger.Log("msg", "application stopped", "exit", sig)
+	case err := <-errc:
+		fatal(logger, err)
+	}
 }
 
 func fatal(logger log.Logger, err error) {
-	_ = level.Error(logger).Log("err", err)
+	_ = level.Error(logger).Log("msg", "application stopped by an error", "err", err)
 	os.Exit(1)
 }
diff --git a/examples/sarama/cmd/producer/main.go b/examples/sarama/cmd/producer/main.go
@@ -118,17 +118,23 @@ func main() {
 		}
 	}()
 
+	sigc := make(chan os.Signal, 1)
+
 	go func() {
-		sigc := make(chan os.Signal, 1)
 		signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
-		errc <- fmt.Errorf("%s", <-sigc)
 	}()
 
 	_ = logger.Log("msg", "application started")
-	_ = logger.Log("msg", "application stopped", "exit", <-errc)
+
+	select {
+	case sig := <-sigc:
+		_ = logger.Log("msg", "application stopped", "exit", sig)
+	case err := <-errc:
+		fatal(logger, err)
+	}
 }
 
 func fatal(logger log.Logger, err error) {
-	_ = logger.Log("err", err)
+	_ = level.Error(logger).Log("msg", "application stopped by an error", "err", err)
 	os.Exit(1)
 }
diff --git a/examples/sarama/compose.yml b/examples/sarama/compose.yml
@@ -28,7 +28,7 @@ services:
 
   consumer:
     image: library/golang:1.22-alpine
-    restart: always
+    restart: on-failure
     depends_on:
       - kafka
     environment:
@@ -42,7 +42,7 @@ services:
 
   producer:
     image: library/golang:1.22-alpine
-    restart: always
+    restart: on-failure
     depends_on:
       - kafka
     environment: