Skip to content

Commit 90e21e4

Browse files
committed
update
1 parent 9953a3f commit 90e21e4

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
resolver = "2"
33
members = [
44
"asynq",
5-
"asynq-macros"
5+
"asynq-macros",
6+
"asynq-server"
67
]
78
[workspace.package]
89
homepage = "https://github.com/emo-crab/asynq"

asynq-server/src/handler.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ use crate::config::TenantConfig;
77
use crate::error::{Error, Result};
88
use crate::message::{
99
AddToGroupRequest, AddToGroupUniqueRequest, AggregationCheckRequest, ArchiveRequest,
10-
ClientMessage, DeleteAggregationSetRequest, DequeueRequest, EnqueueRequest,
11-
EnqueueUniqueRequest, ListGroupsRequest, ReadAggregationSetRequest, RetryRequest,
12-
ScheduleRequest, ScheduleUniqueRequest, ServerMessage, TaskDoneRequest, TaskInfoResponse,
13-
TaskMessageResponse,
10+
ClientMessage, DeleteAggregationSetRequest, DequeueRequest, EnqueueRequest, EnqueueUniqueRequest,
11+
ListGroupsRequest, ReadAggregationSetRequest, RetryRequest, ScheduleRequest,
12+
ScheduleUniqueRequest, ServerMessage, TaskDoneRequest, TaskInfoResponse, TaskMessageResponse,
1413
};
1514
use crate::server::CURRENT_TENANT;
1615
use asynq::base::Broker;
@@ -300,7 +299,13 @@ impl MessageHandler {
300299
let max_delay = Duration::from_secs(req.max_delay_seconds);
301300
let set_id = self
302301
.broker
303-
.aggregation_check(&queue, &req.group, aggregation_delay, max_delay, req.max_size)
302+
.aggregation_check(
303+
&queue,
304+
&req.group,
305+
aggregation_delay,
306+
max_delay,
307+
req.max_size,
308+
)
304309
.await?;
305310
Ok(ServerMessage::AggregationSetId(set_id))
306311
}
@@ -315,8 +320,10 @@ impl MessageHandler {
315320
.broker
316321
.read_aggregation_set(&queue, &req.group, &req.set_id)
317322
.await?;
318-
let responses: Vec<TaskMessageResponse> =
319-
tasks.iter().map(|msg| self.task_message_to_response(msg)).collect();
323+
let responses: Vec<TaskMessageResponse> = tasks
324+
.iter()
325+
.map(|msg| self.task_message_to_response(msg))
326+
.collect();
320327
Ok(ServerMessage::AggregationSet(responses))
321328
}
322329

asynq/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ rand = "0.9"
6363
cron = "0.15.0"
6464
phf = { version = "0.13.1", features = ["macros"] }
6565
# PostgresSQL support (optional)
66-
sqlx = { version = "0.8", features = ["runtime-tokio", "postgres", "chrono"], optional = true }
6766
sea-orm = { version = "1.1", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"], optional = true }
6867
# Optional dependencies for WebSocket backend
6968
tokio-tungstenite = { version = "0.28", optional = true }
@@ -76,7 +75,7 @@ macros = ["asynq-macros"]
7675
cluster = ["redis/cluster-async"]
7776
sentinel = ["redis/sentinel"]
7877
tls = ["rustls", "redis/tls-rustls", "redis/tokio-rustls-comp", "redis/tls-rustls-webpki-roots", "redis/tls-rustls-insecure"]
79-
postgresql = ["sqlx", "sea-orm", "serde_json"]
78+
postgresql = ["sea-orm", "serde_json"]
8079
websocket = ["tokio-tungstenite", "base64", "serde_json"]
8180
acl = []
8281

asynq/src/error.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ pub enum Error {
2121
#[error("Redis parsing error: {0}")]
2222
RedisParsing(#[from] redis::ParsingError),
2323

24-
#[cfg(feature = "postgresql")]
25-
/// PostgresSQL 错误 (sqlx)
26-
/// PostgresSQL error (sqlx)
27-
#[error("PostgresSQL error: {0}")]
28-
Postgres(#[from] sqlx::Error),
29-
3024
#[cfg(feature = "postgresql")]
3125
/// SeaORM 数据库错误
3226
/// SeaORM database error
@@ -216,8 +210,6 @@ impl Error {
216210
Error::InvalidMessage(_) => {}
217211
Error::Broker(_) => {}
218212
#[cfg(feature = "postgresql")]
219-
Error::Postgres(_) => {}
220-
#[cfg(feature = "postgresql")]
221213
Error::SeaOrm(_) => {}
222214
#[cfg(feature = "json")]
223215
Error::Serialization(_) => {}

0 commit comments

Comments
 (0)