0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle urbackup clients with images disabled

Browse source
This commit is contained in:
shamoon 2023-08-03 08:50:45 -07:00
parent 69d828ec8e
commit cf05a85ad6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/widgets/urbackup/component.jsx
View file

@ -14,7 +14,7 @@ function hasRecentBackups(client, maxDays){
const days = maxDays || 3;
const diffTime = days*24*60*60 // 7 days
const recentFile = (client.lastbackup > (Date.now() / 1000 - diffTime));
const recentImage = ((client.lastbackup_image > (Date.now() / 1000 - diffTime)||client.image_not_supported));
const recentImage = client.image_not_supported || client.image_disabled || (client.lastbackup_image > (Date.now() / 1000 - diffTime));
return (recentFile && recentImage);
}
@ -26,7 +26,7 @@ function determineStatuses(urbackupData) {
urbackupData.clientStatuses.forEach((client) => {
status = Status.noRecent;
if (hasRecentBackups(client, urbackupData.maxDays)) {
status = (client.file_ok && (client.image_ok || client.image_not_supported)) ? Status.ok : Status.errored;
status = (client.file_ok && (client.image_ok || client.image_not_supported || client.image_disabled)) ? Status.ok : Status.errored;
}
switch (status) {
case Status.ok:

2
src/widgets/urbackup/proxy.js
View file

@ -25,7 +25,7 @@ await (async () => {
maxDays: serviceWidget.maxDays
});
} catch (error) {
res.status(500).json({ error: "Something Broke" })
res.status(500).json({ error: "Error communicating with UrBackup server" })
}
})();