From 7951ffa2103bc0e52f95632a274d9b71a494c6a5 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Fri, 29 Apr 2016 15:01:16 -0500 Subject: [PATCH] Error checking on config and tag entries --- sampleData.py | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/sampleData.py b/sampleData.py index 6530590..04f3843 100644 --- a/sampleData.py +++ b/sampleData.py @@ -63,27 +63,38 @@ scan_rate = 30 # default scan rate is 30 seconds save_all = "test" def main(): + try: + # Get tags stored in database + get_tag_request_data = {'where':'{"tag_class":5}'} + get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data) + tags = json.loads(get_tag_request.text) + except Exception, e: + print("Error getting tags: {}".format(e)) + time.sleep(10) + main() - # Get tags stored in database - get_tag_request_data = {'where':'{"tag_class":5}'} - get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data) - tags = json.loads(get_tag_request.text) + try: + sr_req_data = 'where={"parameter": "scan_rate"}' + sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data)) + sr_try = json.loads(sr_req.text) + if len(sr_try) > 0: + scan_rate = int(sr_try[0]['val']) + except Exception, e: + print("Error getting scan rage: {}".format(e)) + print("I'll just use {} seconds as the scan rate...".format(scan_rate)) - sr_req_data = 'where={"parameter": "scan_rate"}' - sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data)) - print sr_req.url - sr_try = json.loads(sr_req.text) - if len(sr_try) > 0: - scan_rate = int(sr_try[0]['val']) - - sa_req_data = {"where":{"parameter":"save_all"}} - sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data) - sa_try = json.loads(sa_req.text) - if len(sa_try) > 0: - if sa_try[0]['val'].lower() == "true": - save_all = True - elif sa_try[0]['val'].lower() == "false": - save_all = False + try: + sa_req_data = {"where":{"parameter":"save_all"}} + sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data) + sa_try = json.loads(sa_req.text) + if len(sa_try) > 0: + if sa_try[0]['val'].lower() == "true": + save_all = True + elif sa_try[0]['val'].lower() == "false": + save_all = False + except Exception, e: + print("Error getting save-all: {}".format(e)) + print("I'll just use {} as the save-all parameter...".format(save_all)) for t in tags: # name, tag, db_id, data_type, change_threshold, guarantee_sec, mapFn=None, device_type='CLX', ip_address='192.168.1.10'):