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

silence query logs for `Files` table fix+

merge-requests/63/head
Moe 2018-09-28 09:18:49 -07:00
parent dc554481d4
commit 2b4dcd8694
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
camera.js
View File

@ -148,15 +148,15 @@ if(config.childNodes.mode !== 'child'){
//add Cloud Videos table, will remove in future //add Cloud Videos table, will remove in future
s.sqlQuery('CREATE TABLE IF NOT EXISTS `Cloud Videos` (`mid` varchar(50) NOT NULL,`ke` varchar(50) DEFAULT NULL,`href` text NOT NULL,`size` float DEFAULT NULL,`time` timestamp NULL DEFAULT NULL,`end` timestamp NULL DEFAULT NULL,`status` int(1) DEFAULT \'0\' COMMENT \'0:Complete,1:Read,2:Archive\',`details` text) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;',[],function(err){ s.sqlQuery('CREATE TABLE IF NOT EXISTS `Cloud Videos` (`mid` varchar(50) NOT NULL,`ke` varchar(50) DEFAULT NULL,`href` text NOT NULL,`size` float DEFAULT NULL,`time` timestamp NULL DEFAULT NULL,`end` timestamp NULL DEFAULT NULL,`status` int(1) DEFAULT \'0\' COMMENT \'0:Complete,1:Read,2:Archive\',`details` text) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;',[],function(err){
// if(err)console.log(err) // if(err)console.log(err)
}) },true)
//create Files table //create Files table
s.sqlQuery('CREATE TABLE IF NOT EXISTS `Files` (`ke` varchar(50) NOT NULL,`mid` varchar(50) NOT NULL,`name` tinytext NOT NULL,`size` float NOT NULL DEFAULT \'0\',`details` text NOT NULL,`status` int(1) NOT NULL DEFAULT \'0\') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;',[],function(err){ s.sqlQuery('CREATE TABLE IF NOT EXISTS `Files` (`ke` varchar(50) NOT NULL,`mid` varchar(50) NOT NULL,`name` tinytext NOT NULL,`size` float NOT NULL DEFAULT \'0\',`details` text NOT NULL,`status` int(1) NOT NULL DEFAULT \'0\') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;',[],function(err){
// if(err)console.log(err) // if(err)console.log(err)
}) },true)
//add time to Files table //add time to Files table
s.sqlQuery('ALTER TABLE `Files` ADD COLUMN `time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `status`;',[],function(err){ s.sqlQuery('ALTER TABLE `Files` ADD COLUMN `time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `status`;',[],function(err){
// if(err)console.log(err) // if(err)console.log(err)
}) },true)
//master node - startup functions //master node - startup functions
setInterval(function(){ setInterval(function(){
s.cpuUsage(function(cpu){ s.cpuUsage(function(cpu){

4
libs/sql.js
View File

@ -43,7 +43,7 @@ module.exports = function(s,config){
newValue = new Date(value.replace('T',' ')) newValue = new Date(value.replace('T',' '))
return newValue return newValue
} }
s.sqlQuery = function(query,values,onMoveOn){ s.sqlQuery = function(query,values,onMoveOn,hideLog){
if(!values){values=[]} if(!values){values=[]}
if(typeof values === 'function'){ if(typeof values === 'function'){
var onMoveOn = values; var onMoveOn = values;
@ -55,7 +55,7 @@ module.exports = function(s,config){
return s.databaseEngine return s.databaseEngine
.raw(query,values) .raw(query,values)
.asCallback(function(err,r){ .asCallback(function(err,r){
if(err){ if(err && !hideLog){
console.log('s.sqlQuery QUERY ERRORED',query) console.log('s.sqlQuery QUERY ERRORED',query)
console.log('s.sqlQuery ERROR',err) console.log('s.sqlQuery ERROR',err)
} }