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

Fix "File Delete Error" caused by permission issue+

merge-requests/63/head
Moe 2018-10-08 15:15:31 -07:00
parent d9912bacdf
commit dc9dd9ecb0
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/monitor.js
View File

@ -530,7 +530,7 @@ module.exports = function(s,config,lang){
fs.mkdirSync(e.dir);
}
}
exec('chmod -R 777 '+e.dir,function(err){
fs.chmod(e.dir,0o777,function(err){
})
//set the temporary files directory
@ -548,7 +548,7 @@ module.exports = function(s,config,lang){
}
}
setStreamDir()
exec('chmod -R 777 '+e.sdir,function(err){
fs.chmod(e.sdir,0o777,function(err){
})
return setStreamDir

6
libs/socketio.js
View File

@ -333,8 +333,10 @@ module.exports = function(s,config,lang,io){
cn.emit('segment', data);
};
cn.closeSocketVideoStream = function(){
mp4frag.removeListener('segment', onSegment)
mp4frag.removeListener('initialized', onInitialized)
if(mp4frag){
mp4frag.removeListener('segment', onSegment)
mp4frag.removeListener('initialized', onInitialized)
}
}
cn.on('MP4Command',function(msg){
switch (msg) {

7
libs/videos.js
View File

@ -156,6 +156,9 @@ module.exports = function(s,config,lang){
]
s.sqlQuery('INSERT INTO Videos (mid,ke,time,ext,status,details,size,end) VALUES (?,?,?,?,?,?,?,?)',save,function(err){
if(callback)callback(err)
fs.chmod(k.dir+k.file,0o777,function(err){
})
})
//purge over max
s.purgeDiskForGroup(e)
@ -188,7 +191,7 @@ module.exports = function(s,config,lang){
s.sqlQuery('SELECT * FROM Videos WHERE `mid`=? AND `ke`=? AND `time`=?',queryValues,function(err,r){
if(r && r[0]){
r = r[0]
exec('chmod -R 777 '+e.dir+filename,function(err){
fs.chmod(e.dir+filename,0o777,function(err){
var deleteRow = function(){
s.tx({
f: 'video_delete',
@ -205,7 +208,7 @@ module.exports = function(s,config,lang){
}
})
}
exec('rm '+e.dir+filename,function(err){
fs.unlink(e.dir+filename,function(err){
if(err){
s.systemLog(lang['File Delete Error'] + ' : '+e.ke+' : '+' : '+e.id,err)
}else{