diff --git a/baas/config.js b/baas/config.js index 9503a715fbe476c2f0e3974e780080b8ba6b63e9..5a7b6cc6e3865b709c7eb4204ba2beb6c127b124 100644 --- a/baas/config.js +++ b/baas/config.js @@ -207,7 +207,13 @@ function kill_callback(error, stdout, stderr) { function kill_processes() { for(var i = 0; i < running_processes.length; i++) { - console.log(running_processes[i]); - running_processes[i].kill(); + console.log("About to kill " + running_processes[i][0].pid); + running_processes[i][0].kill(); + var lockfile = + path.join(BAAS_ARCHIVE_DIR, running_processes[i][1], + "lockfile.lock"); + console.log("About to unlink lockfile " + lockfile); + fs.unlinkSync(lockfile); + } } diff --git a/baas/dup_calls.js b/baas/dup_calls.js index 87b39901cee48891d26a83e12ff2b1f6a7d4e1a1..43655171cfc40e494c83d3ad5e61fae8ea707d70 100644 --- a/baas/dup_calls.js +++ b/baas/dup_calls.js @@ -231,7 +231,8 @@ function call_duplicity(mode, backup_set, force) { var backup_name = (backup_set) ? backup_set.cloud + "/" + backup_set.name : $("#res-cloud").val() + "/" + $("#res-backup-name"); - args.push("--name", SHA256(backup_name)); + backup_name = SHA256(backup_name).toString(); + args.push("--name", backup_name); var sel_cloud = (backup_set) ? backup_set.cloud : $("#res-cloud").val(); @@ -244,7 +245,7 @@ function call_duplicity(mode, backup_set, force) { // call duplicity var wProcess = null; wProcess = spawn(ENV_CMD, args, {env: make_env()}); - running_processes.push(wProcess); + running_processes.push([wProcess, backup_name]); var output_str = ""; function dup_call_out(data) {