Merge pull request #59 from oiwn/dev

Improving worker and tasks handling
oiwn · Feb 5, 2025 · e471867 · e471867
2 parents bce0020 + 3199c36
commit e471867
Show file tree

Hide file tree

Showing 6 changed files with 360 additions and 123 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
@@ -0,0 +1,4 @@
+[advisories]
+ignore = [
+  "RUSTSEC-2025-0003", "RUSTSEC-2024-0384"
+]
diff --git a/.github/workflows/platform-coverage.yml b/.github/workflows/platform-coverage.yml
@@ -91,7 +91,8 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Install sqlx-cli
-        run: cargo install sqlx-cli --no-default-features --features postgres
+        # run: cargo install sqlx-cli --no-default-features --features postgres
+        run: cargo install sqlx-cli --no-default-features --features postgres --force
 
       - name: Run database migrations  
         run: cargo sqlx migrate run

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -65,7 +65,8 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Install sqlx-cli
-        run: cargo install sqlx-cli --no-default-features --features postgres
+        # run: cargo install sqlx-cli --no-default-features --features postgres
+        run: cargo install sqlx-cli --no-default-features --features postgres --force
 
       - name: Run database migrations
         run: cargo sqlx migrate run

diff --git a/capp-queue/src/queue.rs b/capp-queue/src/queue.rs
@@ -18,7 +18,6 @@ where
     async fn pop(&self) -> Result<Task<Data>, TaskQueueError>;
     async fn ack(&self, task_id: &TaskId) -> Result<(), TaskQueueError>;
     async fn nack(&self, task: &Task<Data>) -> Result<(), TaskQueueError>;
-    // NOTE: probably need to move into different trait
     async fn set(&self, task: &Task<Data>) -> Result<(), TaskQueueError>;
 }
 

diff --git a/capp/Cargo.toml b/capp/Cargo.toml
@@ -47,10 +47,9 @@ serde_yaml = "0.9"
 rustis = { version = "0.13", features = ["tokio-runtime"], optional = true }
 mongodb = { version = "3", optional = true }
 sqlx = { version = "0.8", features = [ "runtime-tokio", "postgres", "json", "uuid", "chrono" ], optional = true }
-tracing-futures = "0.2"
 
 [dev-dependencies]
-capp = { path = ".", features = ["http", "router", "healthcheck", "mongodb", "redis", "postgres"] }
+capp = { path = ".", features = ["http", "router", "healthcheck", "mongodb", "redis"] }
 hyper = { version = "1.5", features = ["server", "http1"] }
 http-body-util = "0.1"
 bytes = "1.6"