integrity: better log messages
This commit is contained in:
@@ -357,16 +357,25 @@ async function verify(backupSite, remotePath, integrityMap, progressCallback) {
|
||||
|
||||
const relativePath = path.relative(remotePath, entry.path);
|
||||
const integrity = integrityMap.get(relativePath);
|
||||
debug(`verify: computed integrity of ${entry.path} as ${JSON.stringify(result)}`);
|
||||
if (result.transferred !== integrity.size) messages.push(`${entry.path} has size ${result.transferred}. Expecting ${integrity.size}`);
|
||||
else if (result.digest !== integrity.sha256) messages.push(`${entry.path} has digest ${result.digest()}. Expecting ${integrity.sha256}`);
|
||||
if (result.transferred !== integrity.size) {
|
||||
messages.push(`${entry.path} has size ${result.transferred}. Expecting ${integrity.size}`);
|
||||
debug(`verify: size check of ${entry.path} failed: ${messages.at(-1)}`);
|
||||
} else if (result.digest !== integrity.sha256) {
|
||||
messages.push(`${entry.path} has digest ${result.digest()}. Expecting ${integrity.sha256}`);
|
||||
debug(`verify: digest check of ${entry.path} failed: ${messages.at(-1)}`);
|
||||
} else {
|
||||
debug(`verify: ${entry.path} passed`);
|
||||
}
|
||||
});
|
||||
fileCount += batch.entries.length;
|
||||
if (!batch.marker) break;
|
||||
marker = batch.marker;
|
||||
}
|
||||
|
||||
if (integrityMap.size !== fileCount) messages.push(`Got ${fileCount} files. Expecting ${integrityMap.size()} files`);
|
||||
if (integrityMap.size !== fileCount) {
|
||||
messages.push(`Got ${fileCount} files. Expecting ${integrityMap.size()} files`);
|
||||
debug(`verify: file count mismatch: ${messages.at(-1)}`);
|
||||
}
|
||||
|
||||
return messages;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user