MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-04 10:25:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-06-27 13:02:56 -07:00
commit 32de0f3ae2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db.js
View File

@ -109,7 +109,13 @@ module.exports.CreateDB = function (parent, func) {
obj.eventsfile.remove({ time: { '$lt': new Date(Date.now() - (expireEventsSeconds * 1000)) } }, { multi: true }); // Force delete older events
obj.powerfile.remove({ time: { '$lt': new Date(Date.now() - (expirePowerEventsSeconds * 1000)) } }, { multi: true }); // Force delete older events
obj.serverstatsfile.remove({ time: { '$lt': new Date(Date.now() - (expireServerStatsSeconds * 1000)) } }, { multi: true }); // Force delete older events
} else if ((obj.databaseType == 4) || (obj.databaseType == 5)) { // MariaDB or MySQL
sqlDbQuery('DELETE FROM events WHERE time < ?', [new Date(Date.now() - (expireEventsSeconds * 1000))], function (doc, err) { }); // Delete events older than expireEventsSeconds
sqlDbQuery('DELETE FROM power WHERE time < ?', [new Date(Date.now() - (expirePowerEventsSeconds * 1000))], function (doc, err) { }); // Delete events older than expirePowerSeconds
sqlDbQuery('DELETE FROM serverstats WHERE expire < ?', [new Date()], function (doc, err) { }); // Delete events where expiration date is in the past
sqlDbQuery('DELETE FROM smbios WHERE expire < ?', [new Date()], function (doc, err) { }); // Delete events where expiration date is in the past
}
obj.removeInactiveDevices();
}
@ -1471,7 +1477,7 @@ module.exports.CreateDB = function (parent, func) {
// Database actions on the Server Stats collection
obj.SetServerStats = function (data, func) { sqlDbQuery('REPLACE INTO serverstats VALUE (?, ?, ?)', [data.time, data.expire, JSON.stringify(data)], func); };
obj.GetServerStats = function (hours, func) { var t = new Date(); t.setTime(t.getTime() - (60 * 60 * 1000 * hours)); sqlDbQuery('SELECT doc FROM serverstats WHERE time > ?', [t], func); }; // TODO: Expire old entries
obj.GetServerStats = function (hours, func) { var t = new Date(); t.setTime(t.getTime() - (60 * 60 * 1000 * hours)); sqlDbQuery('SELECT doc FROM serverstats WHERE time > ?', [t], func); };
// Read a configuration file from the database
obj.getConfigFile = function (path, func) { obj.Get('cfile/' + path, func); }

7
translate/translate.json
View File

@ -15671,6 +15671,7 @@
},
{
"en": "Connect using hardware KVM",
"pl": "Połącz za pomocą sprzętowego KVM",
"xloc": [
"default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1hspan"
]
@ -26214,6 +26215,7 @@
},
{
"en": "Failed to sign agent {0}: {1}",
"pl": "Nieudane przypisanie agenta {0}: {1}",
"xloc": [
"default.handlebars->41->104"
]
@ -32682,6 +32684,7 @@
},
{
"en": "Intel&reg; Standard Manageability (Intel&reg; SM)",
"pl": "Intel&reg; Standard Manageability (Intel&reg; SM)",
"xloc": [
"default-mobile.handlebars->11->578",
"default.handlebars->41->1467"
@ -32689,12 +32692,14 @@
},
{
"en": "Intel&reg;AMT",
"pl": "Intel&reg;AMT",
"xloc": [
"default.handlebars->41->957"
]
},
{
"en": "Intel&reg;SM",
"pl": "Intel&reg;SM",
"xloc": [
"default.handlebars->41->955"
]
@ -49921,6 +49926,7 @@
},
{
"en": "Redirection port or KVM feature is disabled",
"pl": "Pzekierowania portu lub funkcja KVM są wyłączone",
"xloc": [
"default.handlebars->container->column_l->p11->p11warning->3",
"default.handlebars->container->column_l->p12->p12warning->3"
@ -53199,6 +53205,7 @@
},
{
"en": "Reverse Mouse Wheel",
"pl": "Odwróć Zachowanie Rolki Myszy",
"xloc": [
"default.handlebars->container->dialog->dialogBody->dialog7->d7amtkvm->5->d7otherset->7",
"default.handlebars->container->dialog->dialogBody->dialog7->d7meshkvm->d7desktopOtherSettings->d7otherset2->3",