mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-03-09 13:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1942 from dkirker/DVCSMP-2598

Browse Source 
DVCSMP-2598 Fix Wattvision throwing HttpResponseException
This commit is contained in:
Vinay Rao
2017-04-25 11:33:00 -07:00
committed by GitHub
parent d91fc1c9d1 6a76a8ee39
commit e641759a47
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy
View File

@@ -136,10 +136,20 @@ def getDataForChild(child, startDate, endDate) {
def wattvisionURL = wattvisionURL(child.deviceNetworkId, startDate, endDate) def wattvisionURL = wattvisionURL(child.deviceNetworkId, startDate, endDate)
if (wattvisionURL) { if (wattvisionURL) {
httpGet(uri: wattvisionURL) { response -> try {
def json = new org.json.JSONObject(response.data.toString()) httpGet(uri: wattvisionURL) { response ->
child.addWattvisionData(json) def json = new org.json.JSONObject(response.data.toString())
return "success" child.addWattvisionData(json)
return "success"
}
} catch (groovyx.net.http.HttpResponseException httpE) {
log.error "Wattvision getDataForChild HttpResponseException: ${httpE} -> ${httpE.response.data}"
//log.debug "wattvisionURL = ${wattvisionURL}"
return "fail"
} catch (e) {
log.error "Wattvision getDataForChild General Exception: ${e}"
//log.debug "wattvisionURL = ${wattvisionURL}"
return "fail"
} }
} }
} }
@@ -164,9 +174,14 @@ def wattvisionURL(senorId, startDate, endDate) {
if (diff > 259200000) { // 3 days in milliseconds if (diff > 259200000) { // 3 days in milliseconds
// Wattvision only allows pulling 3 hours of data at a time // Wattvision only allows pulling 3 hours of data at a time
startDate = new Date(hours: endDate.hours - 3) startDate = new Date(hours: endDate.hours - 3)
} else if (diff < 10000) { // 10 seconds in milliseconds
// Wattvision throws errors when the difference between start_time and end_time is 5 seconds or less
// So we are going to make sure that we have a few more seconds of breathing room
use (groovy.time.TimeCategory) {
startDate = endDate - 10.seconds
}
} }
def params = [ def params = [
"sensor_id" : senorId, "sensor_id" : senorId,
"api_id" : wattvisionApiAccess.id, "api_id" : wattvisionApiAccess.id,
@@ -480,4 +495,3 @@ def connectionSuccessful(deviceName, iconSrc) {
render contentType: 'text/html', data: html render contentType: 'text/html', data: html
} }