From 332bc5ecb6c066e34525a0c92607abdd3efe20c6 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sun, 1 May 2022 23:02:45 +0200
Subject: [PATCH] kafka-pipe: don't use a random server ID

---
 modules/infra-kafka-pipe/src/docker-compose.yml |  5 ++++-
 modules/infra-kafka-pipe/src/kafka-pipe.sh      | 14 +++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/infra-kafka-pipe/src/docker-compose.yml b/modules/infra-kafka-pipe/src/docker-compose.yml
index 31ef1fa..a2f781d 100644
--- a/modules/infra-kafka-pipe/src/docker-compose.yml
+++ b/modules/infra-kafka-pipe/src/docker-compose.yml
@@ -12,8 +12,11 @@ services:
     networks:
       - "kafkatorio-nw"
     environment:
-      FACTORIO_SERVER_CONTAINER_NAME: "factorio-server"
       KAFKATORIO_VERSION: $KAFKATORIO_VERSION
+      # message IDs
+      INSTANCE_ID: "test-server"
+      # name of the docker container
+      FACTORIO_SERVER_CONTAINER_NAME: "factorio-server"
       KAFKA_HOST: "kafka:29092"
     volumes:
       # Windows (requires privileged/root)
diff --git a/modules/infra-kafka-pipe/src/kafka-pipe.sh b/modules/infra-kafka-pipe/src/kafka-pipe.sh
index f6273ac..e6717fd 100644
--- a/modules/infra-kafka-pipe/src/kafka-pipe.sh
+++ b/modules/infra-kafka-pipe/src/kafka-pipe.sh
@@ -12,16 +12,24 @@ endProcess() {
 }
 
 # some random ID, to use as a message key
-INSTANCE_ID=$(cat /proc/sys/kernel/random/uuid)
+#INSTANCE_ID="${INSTANCE_ID}"$(cat /proc/sys/kernel/random/uuid)
+KEY="${INSTANCE_ID:-none}"
 
 while :; do
   docker logs --tail 0 -f "$FACTORIO_SERVER_CONTAINER_NAME" |
     sed -n -e 's/^KafkatorioPacket: //p' |
-    kcat -P -T \
+    kcat -P \
       -b "$KAFKA_HOST" \
       -t kafkatorio.src.server-log \
-      -k "$INSTANCE_ID" \
+      -k "$KEY" \
       -H "KAFKA-PIPE-VERSION=$KAFKATORIO_VERSION"
+#      -T \
+
+# -P producer mode
+# -T echo to stdout
+# -t the topic name
+# -k the key of the message
+# -H add a header
 
   echo "Error - retrying in 10 seconds"
   sleep 10