Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

Docker/init.sh

@@ -81,7 +81,7 @@ if [ ! -e "/config/conf.json" ]; then
   node tools/modifyConfiguration.js cpuUsageMarker=CPU subscriptionId=$SUBSCRIPTION_ID thisIsDocker=true pluginKeys="$PLUGIN_KEYS" databaseType="$DB_TYPE" db="$DATABASE_CONFIG" ssl="$SSL_CONFIG"
   cp /config/conf.json conf.json
 fi
-sudo sed -i -e 's/change_this_to_something_very_random__just_anything_other_than_this/'"$cronKey"'/g' conf.json
+sed -i -e 's/change_this_to_something_very_random__just_anything_other_than_this/'"$cronKey"'/g' conf.json
 
 
 echo "============="

Dockerfile

@@ -88,6 +88,7 @@ COPY . .
 #RUN rm -rf /home/Shinobi/plugins
 COPY ./plugins  /home/Shinobi/plugins
 RUN chmod -R 777 /home/Shinobi/plugins
+RUN chmod 777 /home/Shinobi
 RUN npm i npm@latest -g && \
     npm install --unsafe-perm && \
     npm install pm2 -g

libs/cameraThread/snapshot.js

@@ -45,7 +45,9 @@ const rawMonitorConfig = jsonData.rawMonitorConfig
 // var writeToStderr = function(text){
 //   process.stderr.write(Buffer.from(text))
 // }
-
+var timeout = setTimeout(() => {
+    exitAction()
+},10000)
 var snapProcess = spawn(ffmpegAbsolutePath,ffmpegCommandString,{detached: true})
 snapProcess.stderr.on('data',(data)=>{
   writeToStderr(data.toString())
@@ -54,6 +56,7 @@ snapProcess.stdout.on('data',(data)=>{
   writeToStderr(data.toString())
 })
 snapProcess.on('close',function(data){
+    clearTimeout(timeout)
   if(useIcon){
     var iconStream = fs.createWriteStream(iconImageFile);
     var fileCopy = fs.createReadStream(temporaryImageFile).pipe(iconStream)