nmelone/datalogger-POC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

POCONSOLE-51 forces HTTPS

Browse Source
This commit is contained in:
Patrick McDonagh
2016-06-22 11:58:02 -05:00
parent 637ad310db
commit 2d1b3d9134
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dataLogger.py
View File

@@ -11,7 +11,7 @@ import json
import requests import requests
# DEFAULTS # DEFAULTS
web_address = "http://localhost:3000" web_address = "https://localhost:3000"
scan_rate = 30 # seconds scan_rate = 30 # seconds
save_all = "test" # use True, False, or any string save_all = "test" # use True, False, or any string
plc_handshake_tags = {} plc_handshake_tags = {}
@@ -77,7 +77,7 @@ custom_tags = {}
class Status(Tag): class Status(Tag):
def sendToDB(self): def sendToDB(self):
post_data = {'status': self.value} post_data = {'status': self.value}
r = requests.post('{}/run_status'.format(web_address), data=post_data) r = requests.post('{}/run_status'.format(web_address), data=post_data, verify=False)
resp = json.loads(r.text) resp = json.loads(r.text)
print("Stored {} for {} at {}".format(resp['status'], self.name, resp['createdAt'])) print("Stored {} for {} at {}".format(resp['status'], self.name, resp['createdAt']))
self.last_send_time = time.time() self.last_send_time = time.time()
@@ -87,7 +87,7 @@ def getDeviceTypes():
global web_address global web_address
device_types = {} device_types = {}
try: try:
get_device_type_request = requests.get('{}/device_type'.format(web_address)) get_device_type_request = requests.get('{}/device_type'.format(web_address), verify=False)
device_types_json = json.loads(get_device_type_request.text) device_types_json = json.loads(get_device_type_request.text)
for t in device_types_json: for t in device_types_json:
device_types[t['id']] = t['dType'] device_types[t['id']] = t['dType']
@@ -101,7 +101,7 @@ def readConfig():
global web_address, scan_rate, save_all global web_address, scan_rate, save_all
try: try:
sr_req_data = 'where={"parameter": "scan_rate"}' sr_req_data = 'where={"parameter": "scan_rate"}'
sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data)) sr_req = requests.get('{}/config?{}'.format(web_address, sr_req_data), verify=False)
sr_try = json.loads(sr_req.text) sr_try = json.loads(sr_req.text)
if len(sr_try) > 0: if len(sr_try) > 0:
scan_rate = int(sr_try[0]['val']) scan_rate = int(sr_try[0]['val'])
@@ -111,7 +111,7 @@ def readConfig():
try: try:
sa_req_data = {"where": {"parameter": "save_all"}} sa_req_data = {"where": {"parameter": "save_all"}}
sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data) sa_req = requests.get('{}/config'.format(web_address), params=sa_req_data, verify=False)
sa_try = json.loads(sa_req.text) sa_try = json.loads(sa_req.text)
if len(sa_try) > 0: if len(sa_try) > 0:
if sa_try[0]['val'].lower() == "true": if sa_try[0]['val'].lower() == "true":
@@ -157,7 +157,7 @@ def setupTags():
global device_types, web_address, stroke_tags, gaugeoff_tags, history_tags, welltest_tags, custom_tags global device_types, web_address, stroke_tags, gaugeoff_tags, history_tags, welltest_tags, custom_tags
try: try:
# Get tags stored in database # Get tags stored in database
get_tag_request = requests.get('{}/tag'.format(web_address)) get_tag_request = requests.get('{}/tag'.format(web_address), verify=False)
tags = json.loads(get_tag_request.text) tags = json.loads(get_tag_request.text)
for t in tags: for t in tags:
if t['tag_class']['class_type'] == 'stroke': if t['tag_class']['class_type'] == 'stroke':
@@ -175,7 +175,7 @@ def setupTags():
elif t['tag_class']['class_type'] == 'custom': elif t['tag_class']['class_type'] == 'custom':
custom_tags[t['name']] = Tag(t['name'], t['tag'], t['id'], t['data_type']['plc_type'], t['change_threshold'], t['guarantee_sec'], mapFn=maps[t['map_function']], ip_address=t['deviceID']['address'], device_type=device_types[t['deviceID']['device_type']]) custom_tags[t['name']] = Tag(t['name'], t['tag'], t['id'], t['data_type']['plc_type'], t['change_threshold'], t['guarantee_sec'], mapFn=maps[t['map_function']], ip_address=t['deviceID']['address'], device_type=device_types[t['deviceID']['device_type']])
get_event_request = requests.get('{}/event_config'.format(web_address)) get_event_request = requests.get('{}/event_config'.format(web_address), verify=False)
events = json.loads(get_event_request.text) events = json.loads(get_event_request.text)
for e in events: for e in events:
if e['event_class']['event_class'] == 'analog': if e['event_class']['event_class'] == 'analog':
@@ -190,7 +190,7 @@ def setupTags():
def getMainPLC(): def getMainPLC():
get_plc_req_data = {'where': {'id': 0}} get_plc_req_data = {'where': {'id': 0}}
get_plc_request = requests.get('{}/device'.format(web_address), data=get_plc_req_data) get_plc_request = requests.get('{}/device'.format(web_address), data=get_plc_req_data, verify=False)
return json.loads(get_plc_request.text)[0] return json.loads(get_plc_request.text)[0]
@@ -294,7 +294,7 @@ def main():
'downhole_position': sData['dp_string'], 'downhole_position': sData['dp_string'],
'downhole_load': sData['dl_string'] 'downhole_load': sData['dl_string']
} }
r = requests.post('{}/card'.format(web_address), data=card_ins_req_data) r = requests.post('{}/card'.format(web_address), data=card_ins_req_data, verify=False)
resp = json.loads(r.text) resp = json.loads(r.text)
print "CARD NUMBER {} READ AT {}!".format(resp["card_id"], resp['createdAt']) print "CARD NUMBER {} READ AT {}!".format(resp["card_id"], resp['createdAt'])