Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-03 22:13:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1771 from benphelps/fix/issue-1766

Browse Source 
Fix: Handle urbackup clients with images disabled
This commit is contained in:
shamoon 2023-08-03 08:51:44 -07:00 committed by GitHub
commit ec165b8c74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 days = maxDays || 3;
const diffTime = days*24*60*60 // 7 days const diffTime = days*24*60*60 // 7 days
const recentFile = (client.lastbackup > (Date.now() / 1000 - diffTime)); 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); return (recentFile && recentImage);
} }
@ -26,7 +26,7 @@ function determineStatuses(urbackupData) {
urbackupData.clientStatuses.forEach((client) => { urbackupData.clientStatuses.forEach((client) => {
status = Status.noRecent; status = Status.noRecent;
if (hasRecentBackups(client, urbackupData.maxDays)) { 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) { switch (status) {
case Status.ok: case Status.ok:

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

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