Skip to content

Commit 35e3406

Browse files
committed
Print a more meaningful message when decoding an object fails.
1 parent ca3076b commit 35e3406

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/engine.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,10 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
820820
Ok(manifest) => manifest,
821821
Err(err) => {
822822
self.metrics.invalid_manifests += 1;
823-
warn!("{}: {}.", self.cert.rpki_manifest(), err);
823+
warn!(
824+
"{}: failed to decode manifest.",
825+
self.cert.rpki_manifest()
826+
);
824827
return Ok(None)
825828
}
826829
};
@@ -947,7 +950,7 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
947950
Ok(crl) => crl,
948951
Err(err) => {
949952
self.metrics.invalid_crls += 1;
950-
warn!("{}: {}.", crl_uri, err);
953+
warn!("{}: failed to decode CRL.", crl_uri);
951954
return Ok(None)
952955
}
953956
};
@@ -1078,8 +1081,11 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
10781081
) {
10791082
Ok(manifest) => manifest,
10801083
Err(err) => {
1081-
warn!("{}: {}.", self.cert.rpki_manifest(), err);
10821084
self.metrics.invalid_manifests += 1;
1085+
warn!(
1086+
"{}: failed to decode manifest.",
1087+
self.cert.rpki_manifest(),
1088+
);
10831089
return Err(Failed);
10841090
}
10851091
};
@@ -1126,9 +1132,9 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
11261132
let mut crl = match Crl::decode(stored_manifest.crl().clone()) {
11271133
Ok(crl) => crl,
11281134
Err(err) => {
1129-
warn!("{}: {}.", crl_uri, err);
11301135
self.metrics.invalid_manifests += 1;
11311136
self.metrics.invalid_crls += 1;
1137+
warn!("{}: failed to decode CRL.", crl_uri);
11321138
return Err(Failed)
11331139
}
11341140
};
@@ -1272,8 +1278,8 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
12721278
let cert = match Cert::decode(content) {
12731279
Ok(cert) => cert,
12741280
Err(err) => {
1275-
warn!("{}: {}.", uri, err);
12761281
manifest.metrics.invalid_certs += 1;
1282+
warn!("{}: failed to decode certificate.", uri);
12771283
return Ok(())
12781284
}
12791285
};
@@ -1387,8 +1393,8 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
13871393
) {
13881394
Ok(roa) => roa,
13891395
Err(err) => {
1390-
warn!("{}: {}.", uri, err);
13911396
manifest.metrics.invalid_roas += 1;
1397+
warn!("{}: failed to decode ROA.", uri);
13921398
return Ok(())
13931399
}
13941400
};
@@ -1421,8 +1427,8 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
14211427
) {
14221428
Ok(aspa) => aspa,
14231429
Err(err) => {
1424-
warn!("{}: {}.", uri, err);
14251430
manifest.metrics.invalid_aspas += 1;
1431+
warn!("{}: failed to decode ASPA.", uri);
14261432
return Ok(())
14271433
}
14281434
};
@@ -1454,8 +1460,8 @@ impl<'a, P: ProcessRun> PubPoint<'a, P> {
14541460
) {
14551461
Ok(obj) => obj,
14561462
Err(err) => {
1457-
warn!("{}: {}.", uri, err);
14581463
manifest.metrics.invalid_gbrs += 1;
1464+
warn!("{}: failed to decode GBR.", uri);
14591465
return Ok(())
14601466
}
14611467
};

0 commit comments

Comments
 (0)