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' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

cycling-live-grid
Moe 2023-04-13 11:58:03 -07:00
parent c837cdc109 d7e0ade2d0
commit a3c3f23c3c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/init.sh
View File

@ -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" 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 cp /config/conf.json conf.json
fi 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 "=============" echo "============="

1
Dockerfile
View File

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

5
libs/cameraThread/snapshot.js
View File

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