Skip to content
This repository was archived by the owner on Apr 28, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion run_alerter.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ def node_from_node_config(node_config: NodeConfig):
node_status = get_cosmos_json(node_config.node_rpc_url + '/status',
logger_general)
log_and_print('Success.')
except Exception:
except Exception as e:
logger_general.exception(e) # Log exception stacktrace
raise InitialisationException('Failed to connect to {} at {}'.format(
node_config.node_name, node_config.node_rpc_url))

Expand Down
17 changes: 13 additions & 4 deletions src/monitoring/monitor_utils/get_json.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
import json
import logging
from typing import Dict
import os
from typing import Dict, Union

import requests


def get_json(endpoint: str, logger: logging.Logger) -> Dict:
get_ret = requests.get(endpoint, timeout=10)
def get_json(endpoint: str, logger: logging.Logger,
verify: Union[str, bool] = True) -> Dict:
get_ret = requests.get(endpoint, timeout=10, verify=verify)
logger.debug('get_json: get_ret: %s', get_ret)
return json.loads(get_ret.content.decode('UTF-8'))


def get_cosmos_json_raw(endpoint: str, logger: logging.Logger) -> Dict:
if os.path.isfile("cert.pem"):
return get_json(endpoint, logger, verify="cert.pem")
else:
return get_json(endpoint, logger)


def get_cosmos_json(endpoint: str, logger: logging.Logger) -> Dict:
return get_json(endpoint, logger)['result']
return get_cosmos_json_raw(endpoint, logger)['result']
4 changes: 2 additions & 2 deletions src/setup/setup_user_config_nodes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from configparser import ConfigParser
from typing import Optional, List

from src.monitoring.monitor_utils.get_json import get_json
from src.monitoring.monitor_utils.get_json import get_cosmos_json_raw
from src.utils.config_parsers.user import NodeConfig
from src.utils.logging import DUMMY_LOGGER
from src.utils.user_input import yn_prompt
Expand All @@ -22,7 +22,7 @@ def get_node(nodes_so_far: List[NodeConfig]) -> Optional[NodeConfig]:
rpc_url = input('Node\'s RPC url (typically http://NODE_IP:26657):\n')
print('Trying to connect to endpoint {}/health'.format(rpc_url))
try:
get_json(rpc_url + '/health', DUMMY_LOGGER)
get_cosmos_json_raw(rpc_url + '/health', DUMMY_LOGGER)
print('Success.')
break
except Exception:
Expand Down