TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop iouring, add 2 info logs, silence clippy warning

Browse source 
iouring falls into the same category as eBPF and is a major source of kernel vulnerabilities. the benefits gained here are too minimal to bother keeping this enabled, and makes cross-compiling from macOS impossible

Signed-off-by: strawberry <june@girlboss.ceo>
This commit is contained in:
strawberry 2023-11-26 19:24:25 -05:00
parent dd544fad29
commit 5106203d67
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1362,7 +1362,6 @@ dependencies = [
"libc",
"libz-sys",
"lz4-sys",
"pkg-config",
"zstd-sys",
]

2
Cargo.toml
View file

@ -90,7 +90,7 @@ heed = { git = "https://github.com/timokoesters/heed.git", rev = "f6f825da7fb2c7
# Used for ruma wrapper
serde_html_form = "0.2.2"
rocksdb = { git = "https://github.com/girlbossceo/rust-rocksdb", rev = "eaa2beedb1f36466a52ca01ffbf3a2118b2cb41b", default-features = false, features = ["multi-threaded-cf", "snappy", "lz4", "zstd", "io-uring"], optional = true }
rocksdb = { git = "https://github.com/girlbossceo/rust-rocksdb", rev = "eaa2beedb1f36466a52ca01ffbf3a2118b2cb41b", default-features = false, features = ["multi-threaded-cf", "snappy", "lz4", "zstd"], optional = true }
thread_local = "1.1.7"
# used for TURN server authentication

1
src/service/pdu.rs
View file

@ -383,6 +383,7 @@ impl PartialEq for PduEvent {
self.event_id == other.event_id
}
}
#[allow(clippy::non_canonical_partial_ord_impl)]
impl PartialOrd for PduEvent {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
self.event_id.partial_cmp(&other.event_id)

2
src/service/rooms/event_handler/mod.rs
View file

@ -85,6 +85,7 @@ impl Service {
}
if services().rooms.metadata.is_disabled(room_id)? {
info!("Federaton of room {room_id} is currently disabled on this server. Request by origin {origin} and event ID {event_id}");
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"Federation of this room is currently disabled on this server.",
@ -157,6 +158,7 @@ impl Service {
for prev_id in sorted_prev_events {
// Check for disabled again because it might have changed
if services().rooms.metadata.is_disabled(room_id)? {
info!("Federaton of room {room_id} is currently disabled on this server. Request by origin {origin} and event ID {event_id}");
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"Federation of this room is currently disabled on this server.",