some minor fixes
This commit is contained in:
parent
240c5e36d6
commit
b0202e928a
@ -326,7 +326,8 @@
|
|||||||
"ruleId": "Uuid"
|
"ruleId": "Uuid"
|
||||||
},
|
},
|
||||||
"returns": {
|
"returns": {
|
||||||
"rule": "$ref:Rule"
|
"o:rule": "$ref:Rule",
|
||||||
|
"ruleError": "$ref:RuleError"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Rules.GetRules": {
|
"Rules.GetRules": {
|
||||||
|
|||||||
@ -809,6 +809,7 @@ def list_logEntries():
|
|||||||
value = "inactive"
|
value = "inactive"
|
||||||
|
|
||||||
if entry['source'] == "LoggingSourceStates":
|
if entry['source'] == "LoggingSourceStates":
|
||||||
|
print "have state change"
|
||||||
typeId = entry['typeId']
|
typeId = entry['typeId']
|
||||||
sourceType = "State Changed"
|
sourceType = "State Changed"
|
||||||
symbolString = "->"
|
symbolString = "->"
|
||||||
@ -828,9 +829,10 @@ def list_logEntries():
|
|||||||
device = get_device(entry['deviceId'])
|
device = get_device(entry['deviceId'])
|
||||||
if device is not None:
|
if device is not None:
|
||||||
deviceName = device['name']
|
deviceName = device['name']
|
||||||
deviceIdCache[entry['deviceId']] = deviceName
|
|
||||||
else:
|
else:
|
||||||
deviceName = typeId
|
deviceName = entry['deviceId']
|
||||||
|
deviceIdCache[entry['deviceId']] = deviceName
|
||||||
|
print "added entryp to devicechace 1", deviceName, entry['deviceId']
|
||||||
|
|
||||||
|
|
||||||
if entry['source'] == "LoggingSourceActions":
|
if entry['source'] == "LoggingSourceActions":
|
||||||
@ -856,6 +858,7 @@ def list_logEntries():
|
|||||||
else:
|
else:
|
||||||
deviceName = entry['deviceId']
|
deviceName = entry['deviceId']
|
||||||
deviceIdCache[entry['deviceId']] = deviceName
|
deviceIdCache[entry['deviceId']] = deviceName
|
||||||
|
print "added entryp to devicechace 2", deviceName
|
||||||
|
|
||||||
if entry['source'] == "LoggingSourceEvents":
|
if entry['source'] == "LoggingSourceEvents":
|
||||||
typeId = entry['typeId']
|
typeId = entry['typeId']
|
||||||
@ -869,14 +872,16 @@ def list_logEntries():
|
|||||||
eventTypeIdCache[typeId] = sourceName
|
eventTypeIdCache[typeId] = sourceName
|
||||||
value = entry['value']
|
value = entry['value']
|
||||||
if entry['deviceId'] in deviceIdCache:
|
if entry['deviceId'] in deviceIdCache:
|
||||||
|
print "entry is in devicecache"
|
||||||
deviceName = deviceIdCache[entry['deviceId']]
|
deviceName = deviceIdCache[entry['deviceId']]
|
||||||
else:
|
else:
|
||||||
device = get_device(entry['deviceId'])
|
device = get_device(entry['deviceId'])
|
||||||
if device is not None:
|
if device is not None:
|
||||||
deviceName = device['name']
|
deviceName = device['name']
|
||||||
else:
|
else:
|
||||||
devieName = entry['deviceId']
|
deviceName = entry['deviceId']
|
||||||
deviceIdCache[entry['deviceId']] = deviceName
|
deviceIdCache[entry['deviceId']] = deviceName
|
||||||
|
print "added entryp to devicechace 3", deviceName
|
||||||
|
|
||||||
|
|
||||||
if entry['source'] == "LoggingSourceRules":
|
if entry['source'] == "LoggingSourceRules":
|
||||||
|
|||||||
Reference in New Issue
Block a user