diff --git a/camera.js b/camera.js index bde9725a..e42fb169 100644 --- a/camera.js +++ b/camera.js @@ -76,7 +76,7 @@ loadLib('ffmpeg')(s,config,function(){ //health : cpu and ram trackers.. loadLib('health')(s,config,lang,io) //cluster module - loadLib('childNode')(s,config,lang,io) + loadLib('childNode')(s,config,lang,app,io) //cloud uploaders : amazon s3, webdav, backblaze b2.. loadLib('cloudUploaders')(s,config,lang) //notifiers : discord.. diff --git a/libs/childNode.js b/libs/childNode.js index a1f397ea..6a80802c 100644 --- a/libs/childNode.js +++ b/libs/childNode.js @@ -1,7 +1,7 @@ var http = require('http'); var https = require('https'); var express = require('express'); -module.exports = function(s,config,lang){ +module.exports = function(s,config,lang,app,io){ //setup Master for childNodes if(config.childNodes.enabled === true && config.childNodes.mode === 'master'){ s.childNodes = {}; diff --git a/libs/notification.js b/libs/notification.js index 138012cd..70118e94 100644 --- a/libs/notification.js +++ b/libs/notification.js @@ -184,6 +184,7 @@ module.exports = function(s,config,lang){ } } var onTwoFactorAuthCodeNotificationForEmail = function(r){ + // r = user object if(r.details.factor_mail !== '0'){ var mailOptions = { from: config.mail.from, diff --git a/libs/startup.js b/libs/startup.js index c2a179fa..83f7a5b2 100644 --- a/libs/startup.js +++ b/libs/startup.js @@ -24,7 +24,7 @@ module.exports = function(s,config,lang,io){ if(!orphanedVideosForMonitors[monitor.ke])orphanedVideosForMonitors[monitor.ke] = {} if(!orphanedVideosForMonitors[monitor.ke][monitor.mid])orphanedVideosForMonitors[monitor.ke][monitor.mid] = 0 s.initiateMonitorObject(monitor) - s.orphanedVideoCheck(monitor,null,function(orphanedFilesCount){ + s.orphanedVideoCheck(monitor,4,function(orphanedFilesCount){ if(orphanedFilesCount){ orphanedVideosForMonitors[monitor.ke][monitor.mid] += orphanedFilesCount } @@ -42,6 +42,8 @@ module.exports = function(s,config,lang,io){ }) } loadMonitor(monitors[loadCompleted]) + }else{ + callback() } }) }