fix

docker-compose.yml

@@ -1,79 +1,40 @@
-version: '3.8'
-
 services:
-  # Worker für andreasknuth.de
+  worker:
-  worker-andreasknuth:
+    image: python:3.11-slim
-    build: .
+    container_name: email-worker-${WORKER_DOMAIN}
-    container_name: worker-andreasknuth-de
     restart: unless-stopped
     network_mode: host  # Zugriff auf lokales Netzwerk für Postfix
+    
+    # Worker-Code mounten
+    volumes:
+      - ./worker.py:/app/worker.py:ro
+    
+    working_dir: /app
+    
+    # Python Dependencies installieren und Worker starten
+    command: >
+      sh -c "pip install --no-cache-dir boto3 &&
+             python -u worker.py"
+    
     environment:
+      # ⚠️ WICHTIG: WORKER_DOMAIN muss von außen gesetzt werden!
+      - WORKER_DOMAIN=${WORKER_DOMAIN}
+      
       # AWS Credentials
       - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
       - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-      - AWS_REGION=eu-central-1
-      
-      # Worker Identity
-      - WORKER_NAME=worker-andreasknuth
-      - WORKER_DOMAIN=andreasknuth.de
-      
-      # SQS Queue (domain-spezifisch!)
-      - SQS_QUEUE_URL=https://sqs.eu-central-1.amazonaws.com/123456789/andreasknuth-de-queue
       
       # Worker Settings
-      - POLL_INTERVAL=20
+      - POLL_INTERVAL=${POLL_INTERVAL:-20}
-      - MAX_MESSAGES=10
+      - MAX_MESSAGES=${MAX_MESSAGES:-10}
-      - VISIBILITY_TIMEOUT=300
+      - VISIBILITY_TIMEOUT=${VISIBILITY_TIMEOUT:-300}
       
       # SMTP Configuration
-      - SMTP_HOST=192.168.1.10
+      - SMTP_HOST=${SMTP_HOST:-localhost}
-      - SMTP_PORT=25
+      - SMTP_PORT=${SMTP_PORT:-25}
-      - SMTP_USE_TLS=false
+      - SMTP_USE_TLS=${SMTP_USE_TLS:-false}
-      # Optional: SMTP Auth
+      - SMTP_USER=${SMTP_USER:-}
-      # - SMTP_USER=username
+      - SMTP_PASS=${SMTP_PASS:-}
-      # - SMTP_PASS=password
-    
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "5"
-    
-    healthcheck:
-      test: ["CMD", "pgrep", "-f", "worker.py"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 10s
-
-  # Worker für bizmatch.net (auf demselben Server!)
-  worker-bizmatch:
-    build: .
-    container_name: worker-bizmatch-net
-    restart: unless-stopped
-    network_mode: host
-    environment:
-      # AWS Credentials (gleich wie oben)
-      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
-      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-      - AWS_REGION=eu-central-1
-      
-      # Worker Identity (unterschiedlich!)
-      - WORKER_NAME=worker-bizmatch
-      - WORKER_DOMAIN=bizmatch.net
-      
-      # SQS Queue (unterschiedlich!)
-      - SQS_QUEUE_URL=https://sqs.eu-central-1.amazonaws.com/123456789/bizmatch-net-queue
-      
-      # Worker Settings
-      - POLL_INTERVAL=20
-      - MAX_MESSAGES=10
-      - VISIBILITY_TIMEOUT=300
-      
-      # SMTP Configuration (gleicher Server!)
-      - SMTP_HOST=192.168.1.10
-      - SMTP_PORT=25
-      - SMTP_USE_TLS=false
     
     logging:
       driver: "json-file"

worker.py

@@ -1,4 +1,3 @@
-# worker.py
 import os
 import sys
 import boto3
@@ -11,15 +10,14 @@ from email.parser import BytesParser
 from email.policy import SMTP as SMTPPolicy
 from datetime import datetime
 
-# AWS Clients
+# AWS Configuration
-AWS_REGION = os.environ.get('AWS_REGION', 'eu-central-1')
+AWS_REGION = 'us-east-2'
 s3 = boto3.client('s3', region_name=AWS_REGION)
 sqs = boto3.client('sqs', region_name=AWS_REGION)
 
 # ✨ Worker Configuration (domain-spezifisch)
 WORKER_DOMAIN = os.environ.get('WORKER_DOMAIN')  # z.B. 'andreasknuth.de'
 WORKER_NAME = os.environ.get('WORKER_NAME', f'worker-{WORKER_DOMAIN}')
-QUEUE_URL = os.environ.get('SQS_QUEUE_URL')
 
 # Worker Settings
 POLL_INTERVAL = int(os.environ.get('POLL_INTERVAL', '20'))
@@ -53,6 +51,22 @@ def log(message: str, level: str = 'INFO'):
     print(f"[{timestamp}] [{level}] [{WORKER_NAME}] {message}", flush=True)
 
 
+def domain_to_queue_name(domain: str) -> str:
+    """Konvertiert Domain zu SQS Queue Namen"""
+    return domain.replace('.', '-') + '-queue'
+
+
+def get_queue_url() -> str:
+    """Ermittelt Queue-URL für die konfigurierte Domain"""
+    queue_name = domain_to_queue_name(WORKER_DOMAIN)
+    
+    try:
+        response = sqs.get_queue_url(QueueName=queue_name)
+        return response['QueueUrl']
+    except Exception as e:
+        raise Exception(f"Failed to get queue URL for {WORKER_DOMAIN}: {e}")
+
+
 def mark_as_processed(bucket: str, key: str):
     """Markiert E-Mail als erfolgreich zugestellt"""
     try:
@@ -261,12 +275,19 @@ def process_message(message_body: dict, receive_count: int) -> bool:
 def main_loop():
     """Hauptschleife: Pollt SQS Queue und verarbeitet Nachrichten"""
     
+    # Queue URL ermitteln
+    try:
+        queue_url = get_queue_url()
+    except Exception as e:
+        log(f"FATAL: {e}", 'ERROR')
+        sys.exit(1)
+    
     log(f"\n{'='*70}")
     log(f"🚀 Email Worker started")
     log(f"{'='*70}")
     log(f"  Worker Name: {WORKER_NAME}")
     log(f"  Domain: {WORKER_DOMAIN}")
-    log(f"  Queue: {QUEUE_URL}")
+    log(f"  Queue: {queue_url}")
     log(f"  Region: {AWS_REGION}")
     log(f"  SMTP: {SMTP_HOST}:{SMTP_PORT} (TLS: {SMTP_USE_TLS})")
     log(f"  Poll interval: {POLL_INTERVAL}s")
@@ -283,7 +304,7 @@ def main_loop():
         try:
             # Messages aus Queue holen (Long Polling)
             response = sqs.receive_message(
-                QueueUrl=QUEUE_URL,
+                QueueUrl=queue_url,
                 MaxNumberOfMessages=MAX_MESSAGES,
                 WaitTimeSeconds=POLL_INTERVAL,
                 VisibilityTimeout=VISIBILITY_TIMEOUT,
@@ -332,7 +353,7 @@ def main_loop():
                     if success:
                         # Message aus Queue löschen
                         sqs.delete_message(
-                            QueueUrl=QUEUE_URL,
+                            QueueUrl=queue_url,
                             ReceiptHandle=receipt_handle
                         )
                         log("✓ Message deleted from queue")
@@ -345,7 +366,7 @@ def main_loop():
                     log(f"✗ Invalid message format: {e}", 'ERROR')
                     # Ungültige Messages löschen (nicht retryable)
                     sqs.delete_message(
-                        QueueUrl=QUEUE_URL,
+                        QueueUrl=queue_url,
                         ReceiptHandle=receipt_handle
                     )
                 
@@ -382,10 +403,6 @@ if __name__ == '__main__':
         log("ERROR: WORKER_DOMAIN not set!", 'ERROR')
         sys.exit(1)
     
-    if not QUEUE_URL:
-        log("ERROR: SQS_QUEUE_URL not set!", 'ERROR')
-        sys.exit(1)
-    
     try:
         main_loop()
     except Exception as e: