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

Completes POCONSOLE-51. Forces SSL/HTTPS

Browse Source
This commit is contained in:
Patrick McDonagh
2016-06-22 11:47:58 -05:00
parent 1ec4035ea9
commit 325d4affbd
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sampleData.py
View File

@@ -15,7 +15,7 @@ import requests
import json
# DEFAULTS
web_address = "http://localhost:3000"
web_address = "https://localhost:3000"
scan_rate = 30 # seconds
save_all = "test" # use True, False, or any string
@@ -61,7 +61,7 @@ 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)
get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data, verify=False)
tags = json.loads(get_tag_request.text)
except Exception, e:
print("Error getting tags: {}".format(e))
@@ -70,7 +70,7 @@ def main():
try:
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)
if len(sr_try) > 0:
scan_rate = int(sr_try[0]['val'])
@@ -80,7 +80,7 @@ def main():
try:
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)
if len(sa_try) > 0:
if sa_try[0]['val'].lower() == "true":

12
tagserver.py
View File

@@ -14,7 +14,7 @@ import requests
import json
# DEFAULTS
web_address = "http://localhost:3000"
web_address = "https://localhost:3000"
scan_rate = 30 # seconds
save_all = "test" # use True, False, or any string
plc_handshake_tags = {}
@@ -29,7 +29,7 @@ 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)
get_tag_request = requests.get('{}/tag'.format(web_address), params=get_tag_request_data, verify=False)
tags = json.loads(get_tag_request.text)
except Exception, e:
print("Error getting tags: {}".format(e))
@@ -39,7 +39,7 @@ def main():
try:
# Get tags stored in database
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)
for t in device_types_json:
device_types[t['id']] = t['dType']
@@ -50,7 +50,7 @@ def main():
try:
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)
if len(sr_try) > 0:
scan_rate = int(sr_try[0]['val'])
@@ -60,7 +60,7 @@ def main():
try:
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)
if len(sa_try) > 0:
if sa_try[0]['val'].lower() == "true":
@@ -74,7 +74,7 @@ def main():
try:
# Get tags stored in database
get_hs_request_data = {'where': '{"tag_class": 6}'}
get_hs_request = requests.get('{}/tag'.format(web_address), params=get_hs_request_data)
get_hs_request = requests.get('{}/tag'.format(web_address), params=get_hs_request_data, verify=False)
hs_tags = json.loads(get_hs_request.text)
if len(hs_tags) > 0:
for hs in hs_tags: