Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 05:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

peerstate: log database errors

Browse Source
This commit is contained in:
Alexander Krotov
2020-08-05 00:00:00 +03:00
committed by link2xt
parent d106a027c7
commit 3577491b31
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/peerstate.rs
View File

@@ -6,6 +6,7 @@ use num_traits::FromPrimitive;
use crate::aheader::*; use crate::aheader::*;
use crate::context::Context; use crate::context::Context;
use crate::error::Result;
use crate::key::{DcKey, Fingerprint, SignedPublicKey}; use crate::key::{DcKey, Fingerprint, SignedPublicKey};
use crate::sql::Sql; use crate::sql::Sql;
@@ -143,8 +144,21 @@ impl<'a> Peerstate<'a> {
} }
pub async fn from_addr(context: &'a Context, addr: &str) -> Option<Peerstate<'a>> { pub async fn from_addr(context: &'a Context, addr: &str) -> Option<Peerstate<'a>> {
let query = "SELECT addr, last_seen, last_seen_autocrypt, prefer_encrypted, public_key, gossip_timestamp, gossip_key, public_key_fingerprint, gossip_key_fingerprint, verified_key, verified_key_fingerprint FROM acpeerstates WHERE addr=? COLLATE NOCASE;"; let query = "SELECT addr, last_seen, last_seen_autocrypt, prefer_encrypted, public_key, \
Self::from_stmt(context, query, paramsv![addr]).await gossip_timestamp, gossip_key, public_key_fingerprint, gossip_key_fingerprint, \
verified_key, verified_key_fingerprint \
FROM acpeerstates \
WHERE addr=? COLLATE NOCASE;";
match Self::from_stmt(context, query, paramsv![addr]).await {
Ok(peerstate) => peerstate,
Err(err) => {
warn!(
context,
"Can't load peerstate for address {}: {}", addr, err
);
None
}
}
} }
pub async fn from_fingerprint( pub async fn from_fingerprint(
@@ -160,17 +174,26 @@ impl<'a> Peerstate<'a> {
OR gossip_key_fingerprint=? COLLATE NOCASE \ OR gossip_key_fingerprint=? COLLATE NOCASE \
ORDER BY public_key_fingerprint=? DESC;"; ORDER BY public_key_fingerprint=? DESC;";
let fp = fingerprint.hex(); let fp = fingerprint.hex();
Self::from_stmt(context, query, paramsv![fp, fp, fp]).await match Self::from_stmt(context, query, paramsv![fp, fp, fp]).await {
Ok(peerstate) => peerstate,
Err(err) => {
warn!(
context,
"Can't load peerstate for fingerprint {}: {}", fingerprint, err
);
None
}
}
} }
async fn from_stmt( async fn from_stmt(
context: &'a Context, context: &'a Context,
query: &str, query: &str,
params: Vec<&dyn crate::ToSql>, params: Vec<&dyn crate::ToSql>,
) -> Option<Peerstate<'a>> { ) -> Result<Option<Peerstate<'a>>> {
context let peerstate = context
.sql .sql
.query_row(query, params, |row| { .query_row_optional(query, params, |row| {
/* all the above queries start with this: SELECT /* all the above queries start with this: SELECT
addr, last_seen, last_seen_autocrypt, prefer_encrypted, addr, last_seen, last_seen_autocrypt, prefer_encrypted,
public_key, gossip_timestamp, gossip_key, public_key_fingerprint, public_key, gossip_timestamp, gossip_key, public_key_fingerprint,
@@ -213,8 +236,8 @@ impl<'a> Peerstate<'a> {
Ok(res) Ok(res)
}) })
.await .await?;
.ok() Ok(peerstate)
} }
pub fn recalc_fingerprint(&mut self) { pub fn recalc_fingerprint(&mut self) {