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' 

Minor Cleanup

See merge request Shinobi-Systems/Shinobi!294
cron-addstorage-fix
Moe 2021-03-27 13:58:41 +00:00
parent c4d5b78339 0d38d9ecaa
commit 378e7399f9
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/init.sh
View File

@ -69,7 +69,7 @@ if [ "$DB_DISABLE_INCLUDED" = "false" ]; then
else
echo "Create database schema if it does not exists ..."
mysql -u "$DB_USER" -h "$DB_HOST" -p"$DB_PASSWORD" --port="$DB_PORT" -e "source /home/Shinobi/sql/framework.sql" || true
mysql -u "$DB_USER" -h "$DB_HOST" -p"$DB_PASSWORD" --port="$DB_PORT" --database="$DB_DATABASE" -e "source /home/Shinobi/sql/framework.sql" || true
fi
DATABASE_CONFIG='{"host": "'$DB_HOST'","user": "'$DB_USER'","password": "'$DB_PASSWORD'","database": "'$DB_DATABASE'","port":'$DB_PORT'}'

2
INSTALL/shinobi
View File

@ -80,7 +80,7 @@ if [[ $@ == *'restart'* ]]; then
else
if [[ $@ == *'start'* ]] || [[ $@ == *'now'* ]]; then
proccessAlive=$(pm2 list | grep camera | grep online)
if [ "$proccessAlive" ]]; then
if [ "$proccessAlive" ]; then
echo "Shinobi process is already running."
else
if [ -e "$installationDirectory/INSTALL/installed.txt" ]; then

3
libs/commander/worker.js
View File

@ -119,6 +119,7 @@ const initialize = (config,lang) => {
connectionToP2PServer.emit('httpResponse',{
err: err,
json: rawRequest.bodyOnEnd ? json : null,
headers: resp.headers,
rid: rawRequest.rid
})
} : null,
@ -233,7 +234,7 @@ const initialize = (config,lang) => {
s.debugLog('p2p','Server Forced Disconnection')
});
const onDisconnect = () => {
s.systemLog('p2p','Disconnected')
s.systemLog('p2p','P2P Disconnected')
killAllClientConnections()
if(!connectionToP2PServer.allowDisconnect){
s.systemLog('p2p','Attempting Reconnection...')

2
libs/database/utils.js
View File

@ -355,7 +355,7 @@ module.exports = function(s,config){
}
if(options.parseRowDetails){
r.forEach((row) => {
row.details = JSON.parse(row.details)
row.details = s.parseJSON(row.details,{})
})
}
if(options.noCount){

2
package.json
View File

@ -48,7 +48,7 @@
"googleapis": "^39.2.0",
"tree-kill":"1.2.2",
"unzipper":"0.10.11",
"node-fetch":"2.6.0",
"node-fetch":"3.0.0-beta.9",
"fs-extra": "9.0.1"
},
"devDependencies": {},

2
plugins/tensorflow/INSTALL.sh
View File

@ -50,7 +50,7 @@ fi
manualInstallRequirements() {
npm install --unsafe-perm
npm install @tensorflow/tfjs-backend-cpu@2.7.0 @tensorflow/tfjs-backend-webgl@2.7.0 @tensorflow/tfjs-converter@2.7.0 @tensorflow/tfjs-core@2.7.0 @tensorflow/tfjs-layers@2.7.0 @tensorflow/tfjs-node@2.7.0 --unsafe-perm
npm install @tensorflow/tfjs-backend-cpu@2.7.0 @tensorflow/tfjs-backend-webgl@2.7.0 @tensorflow/tfjs-converter@2.7.0 @tensorflow/tfjs-core@2.7.0 @tensorflow/tfjs-layers@2.7.0 @tensorflow/tfjs-node@2.7.0 --unsafe-perm --force
}
installJetson() {

1
web/libs/js/dash2.confirm.js
View File

@ -35,6 +35,7 @@ $(document).ready(function(){
if(options.clickOptions && options.clickCallback)$.confirm.click(options.clickOptions,options.clickCallback)
}
$.confirm.e.on('hidden.bs.modal', function () {
$.confirm.body.empty()
$.confirm.footer.find('.confirmaction').remove()
})
})