ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master' 

Fix Events Cleanup

See merge request Shinobi-Systems/Shinobi!266
cron-addstorage-fix
Moe 2021-01-07 23:02:05 +00:00
parent 149ffdb238 4f6bf2ef9f
commit 7cba4d7d64
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/events/utils.js
View File

@ -282,10 +282,10 @@ module.exports = (s,config,lang,app,io) => {
}
return true
}
const runMultiTrigger = (monitorConfig,eventDetails) => {
const runMultiTrigger = (monitorConfig,eventDetails, d, triggerEvent) => {
s.getCamerasForMultiTrigger(monitorConfig).forEach(function(monitor){
if(monitor.mid !== d.id){
s.triggerEvent({
triggerEvent({
id: monitor.mid,
ke: monitor.ke,
details: {
@ -314,11 +314,11 @@ module.exports = (s,config,lang,app,io) => {
}
return true
}
const runEventExecutions = async (eventTime,monitorConfig,eventDetails,forceSave,filter,d) => {
const runEventExecutions = async (eventTime,monitorConfig,eventDetails,forceSave,filter,d, triggerEvent) => {
const monitorDetails = monitorConfig.details
const detailString = JSON.stringify(eventDetails)
if(monitorDetails.det_multi_trig === '1'){
runMultiTrigger(monitorConfig,eventDetails)
runMultiTrigger(monitorConfig,eventDetails, d, triggerEvent)
}
//save this detection result in SQL, only coords. not image.
if(forceSave || (filter.save && monitorDetails.detector_save === '1')){
@ -572,7 +572,7 @@ module.exports = (s,config,lang,app,io) => {
monitorDetails.detector_use_motion === '0' ||
d.doObjectDetection !== true
){
runEventExecutions(eventTime,monitorConfig,eventDetails,forceSave,filter,d)
runEventExecutions(eventTime,monitorConfig,eventDetails,forceSave,filter,d, triggerEvent)
}
//show client machines the event
s.tx({