From e072fc2082b2e3d3d86b5af4a5e207f26bfbf42f Mon Sep 17 00:00:00 2001 From: vvzvlad Date: Sun, 24 Nov 2024 04:31:42 +0300 Subject: [PATCH] fix error --- checker.py | 13 +++++++------ credentials.json | 2 +- grist.json | 5 +++++ update.sh | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 grist.json diff --git a/checker.py b/checker.py index badfa43..f945378 100644 --- a/checker.py +++ b/checker.py @@ -12,7 +12,7 @@ import random import sys import pkg_resources import requests - +import json required_packages = ['grist-api', 'colorama'] installed_packages = [pkg.key for pkg in pkg_resources.working_set] @@ -130,7 +130,6 @@ def check_logs(log_handler): return data if __name__ == "__main__": - print("Checker started") colorama.init(autoreset=True) logger = logging.getLogger("Checker") logger.setLevel(logging.INFO) @@ -139,16 +138,18 @@ if __name__ == "__main__": ch.setFormatter(formatter) logger.addHandler(ch) + logger.info("Checker started") random_sleep = random.randint(1, 600) logger.info(f"Sleeping for {random_sleep} seconds") time.sleep(random_sleep) - GRIST_SERVER = "###GRIST_SERVER###" - GRIST_DOC_ID = "###GRIST_DOC_ID###" - GRIST_API_KEY = "###GRIST_API_KEY###" + grist_data = {} + with open('/root/node/grist.json', 'r', encoding='utf-8') as f: + grist_data = json.loads(f.read()) + GRIST_ROW_NAME = socket.gethostname() NODES_TABLE = "Nodes" - grist = GRIST(GRIST_SERVER, GRIST_DOC_ID, GRIST_API_KEY, logger) + grist = GRIST(grist_data.get('grist_server'), grist_data.get('grist_doc_id'), grist_data.get('grist_api_key'), logger) current_vm = grist.find_record(name=GRIST_ROW_NAME, table=NODES_TABLE)[0] def grist_callback(msg): grist.update(current_vm.id, msg, NODES_TABLE) diff --git a/credentials.json b/credentials.json index 0671bcf..4a68f9d 100644 --- a/credentials.json +++ b/credentials.json @@ -2,4 +2,4 @@ "priv_key": "###PRIVATE###", "pub_key": "###PUBLIC###", "address": "###ADDRESS###" -} \ No newline at end of file +} diff --git a/grist.json b/grist.json new file mode 100644 index 0000000..31c6266 --- /dev/null +++ b/grist.json @@ -0,0 +1,5 @@ +{ + "grist_server": "###GRIST_SERVER###", + "grist_doc_id": "###GRIST_DOC_ID###", + "grist_api_key": "###GRIST_API_KEY###" +} diff --git a/update.sh b/update.sh index a059944..8ce0a97 100644 --- a/update.sh +++ b/update.sh @@ -12,7 +12,7 @@ NEW_VALUE=$2 FILES=( "credentials.json" "docker-compose.yml" - "checker.py" + "grist.json" ) for FILE in "${FILES[@]}"; do