mirror of
https://github.com/servalproject/serval-dna.git
synced 2025-03-10 14:33:54 +00:00
Fix broken log WARN messages in "rhizome list"
This commit is contained in:
parent
bc11b16d96
commit
3c09a1ec7d
@ -1078,20 +1078,20 @@ int rhizome_find_duplicate(const rhizome_manifest *m, rhizome_manifest **found,
|
|||||||
++inconsistent;
|
++inconsistent;
|
||||||
}
|
}
|
||||||
if (blob_filesize != -1 && blob_filesize != m->fileLength) {
|
if (blob_filesize != -1 && blob_filesize != m->fileLength) {
|
||||||
WARNF("MANIFESTS row id=%s joined to FILES row id=%s has inconsistent blob: known file size %lld, blob.filesize=%lld -- skipped",
|
WARNF("MANIFESTS row id=%s has inconsistent blob: known file size %lld, blob.filesize=%lld -- skipped",
|
||||||
q_manifestid, m->fileHexHash, m->fileLength, blob_filesize);
|
q_manifestid, m->fileLength, blob_filesize);
|
||||||
++inconsistent;
|
++inconsistent;
|
||||||
}
|
}
|
||||||
if (m->fileLength != 0) {
|
if (m->fileLength != 0) {
|
||||||
if (!blob_filehash && strcasecmp(blob_filehash, m->fileHexHash)) {
|
if (!blob_filehash && strcasecmp(blob_filehash, m->fileHexHash)) {
|
||||||
WARNF("MANIFESTS row id=%s joined to FILES row id=%s has inconsistent blob: blob.filehash=%s -- skipped",
|
WARNF("MANIFESTS row id=%s has inconsistent blob: manifests.filehash=%s, blob.filehash=%s -- skipped",
|
||||||
q_manifestid, m->fileHexHash, blob_filehash);
|
q_manifestid, m->fileHexHash, blob_filehash);
|
||||||
++inconsistent;
|
++inconsistent;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!blob_filehash) {
|
if (blob_filehash) {
|
||||||
WARNF("MANIFESTS row id=%s joined to FILES row id=%s has inconsistent blob: blob.filehash should be absent -- skipped",
|
WARNF("MANIFESTS row id=%s has inconsistent blob: blob.filehash should be absent -- skipped",
|
||||||
q_manifestid, m->fileHexHash);
|
q_manifestid);
|
||||||
++inconsistent;
|
++inconsistent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user