sebclem/hassio-nextcloud-backup
1
0
Fork 0
mirror of https://github.com/Sebclem/hassio-nextcloud-backup.git synced 2024-11-22 09:12:58 +01:00
Code Issues Projects Releases Wiki Activity

🚑 Fix crash on upload finish (#8)

Browse Source
This commit is contained in:
Sebastien Clement 2020-02-16 19:13:08 +01:00
parent df8a93fa76
commit 51b10e2bed
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/hassioApiTools.js
View File

@ -8,7 +8,7 @@ const logger = require('../config/winston');
// !!! FOR DEV PURPOSE ONLY !!! // !!! FOR DEV PURPOSE ONLY !!!
//put token here for dev (ssh port tunelling 'sudo ssh -L 80:hassio:80 root@`hassoi_ip`' + put 127.0.0.1 hassio into host) //put token here for dev (ssh port tunelling 'sudo ssh -L 80:hassio:80 root@`hassoi_ip`' + put 127.0.0.1 hassio into host)
const fallbackToken = "3afd4f8440830816e32fd490bd4f98b2423c4d9dff1432a0d57f581c43ec2bf1d1fa9468fc162732f8e95ae524c59ceed0f8e2b8a948d170" const fallbackToken = "337c70d10b65879325f87d3082dff5a126692f3047d5a0b93d729c156e48f33052fe888779a7a9ba0ec175cddaae601f26682965ebbfb43e"
function getSnapshots() { function getSnapshots() {
@ -153,7 +153,7 @@ function createNewBackup(name) {
status.status = "creating"; status.status = "creating";
status.progress = -1; status.progress = -1;
statusTools.setStatus(status); statusTools.setStatus(status);
console.log("Creating new snapshot...") logger.info("Creating new snapshot...")
let token = process.env.HASSIO_TOKEN; let token = process.env.HASSIO_TOKEN;
if (token == null) { if (token == null) {
token = fallbackToken token = fallbackToken
@ -171,12 +171,12 @@ function createNewBackup(name) {
status.message = "Can't create new snapshot (" + error + ")"; status.message = "Can't create new snapshot (" + error + ")";
status.error_code = 5; status.error_code = 5;
statusTools.setStatus(status); statusTools.setStatus(status);
console.error(status.message); logger.error(status.message);
reject(status.message); reject(status.message);
} }
else { else {
body.data.slug; body.data.slug;
console.log('Snapshot created with id ' + body.data.slug); logger.info('Snapshot created with id ' + body.data.slug);
resolve(body.data.slug); resolve(body.data.slug);
} }
}); });
@ -203,7 +203,7 @@ function clean() {
for (let i in toDel) { for (let i in toDel) {
await dellSnap(toDel[i].slug) await dellSnap(toDel[i].slug)
} }
console.log('Local clean done.') logger.info('Local clean done.')
resolve(); resolve();
}).catch(() => { }).catch(() => {
reject(); reject();

4
nextcloud_backup/rootfs/opt/nextcloud_backup/tools/webdavTools.js
View File

@ -195,7 +195,7 @@ class WebdavTools {
reject(status.message); reject(status.message);
} }
else { else {
logger.log("...Upload finish !"); logger.info("...Upload finish !");
status.status = "idle"; status.status = "idle";
status.progress = -1; status.progress = -1;
status.message = null; status.message = null;
@ -256,7 +256,7 @@ class WebdavTools {
for (let i in toDel) { for (let i in toDel) {
await this.client.deleteFile(toDel[i].filename); await this.client.deleteFile(toDel[i].filename);
} }
logger.log('Cloud clean done.') logger.info('Cloud clean done.')
resolve(); resolve();
}).catch((error) => { }).catch((error) => {