diff --git a/docker-compose.yml b/docker-compose.yml index 4257812..1a6310c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -127,11 +127,11 @@ services: # timeout: 2s # retries: 15 healthcheck: - test: ["CMD", \\] + test: ["CMD", "kafka-topics.sh", "--list", "--bootstrap-server", "kafka:9092"] start_period: 15s interval: 2s - timeout: 5s - retries: 30 + timeout: 30s + retries: 45 coordinator: image: apache/druid:0.23.0 diff --git a/environment b/environment index 8c4e756..6244524 100644 --- a/environment +++ b/environment @@ -22,7 +22,7 @@ DRUID_XMX=1g DRUID_XMS=1g DRUID_MAXNEWSIZE=250m DRUID_NEWSIZE=250m -DRUID_MAXDIRECTMEMORYSIZE=6172m +DRUID_MAXDIRECTMEMORYSIZE=2500m druid_emitter_logging_logLevel=debug @@ -38,7 +38,7 @@ druid_metadata_storage_connector_password=FoolishPassword druid_coordinator_balancer_strategy=cachingCost -druid_indexer_runner_javaOptsArray=["-server", "-Xmx1g", "-Xms1g", "-XX:MaxDirectMemorySize=3g", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] +druid_indexer_runner_javaOptsArray=["-server", "-Xmx1g", "-Xms1g", "-XX:MaxDirectMemorySize=1gb", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"] druid_indexer_fork_property_druid_processing_buffer_sizeBytes=256MiB druid_storage_type=local diff --git a/legacy/modules/monitor.py b/legacy/modules/monitor.py index 4c2e457..c8f8e7e 100644 --- a/legacy/modules/monitor.py +++ b/legacy/modules/monitor.py @@ -67,8 +67,6 @@ def parsemeta(numName, c): def queue_message(c): message = json.dumps(c) - print("APPENDING MESSAGE", message) - print("KEY", main.config["Ingest"]["Key"]) main.g.sadd(main.config["Ingest"]["Key"], message) diff --git a/processing/process.py b/processing/process.py index d154b3c..af29917 100644 --- a/processing/process.py +++ b/processing/process.py @@ -145,7 +145,7 @@ def process_data(data): # 4chan - since we change the attributes below if "com" in msg: - msg["msg"] = RE_BAD_CHARS.sub("", msg["msg"]) + msg["com"] = RE_BAD_CHARS.sub("", msg["com"]) if msg["src"] == "4ch": board = msg["net"]