Releasing 0.14.0

- New experimental TLS support ("tls" feature, disabled by default)

Author: SpamapS

.github/workflows/ci.yml

@@ -20,5 +20,5 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
-      - run: cargo build --verbose
-      - run: cargo test --verbose
+      - run: cargo build --all-features --verbose
+      - run: cargo test --all-features --verbose

Cargo.lock

@@ -2,7 +2,7 @@
 name = "rustygear"
 description = "Client library for communicating via the gearman protocol"
 repository = "https://github.com/SpamapS/rustygear"
-version = "0.13.0"
+version = "0.14.0"
 authors = ["Clint Byrum <clint@fewbar.com>"]
 license = "Apache-2.0"
 edition = "2018"

rustygear/Cargo.toml

@@ -7,20 +7,23 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let mut client = Client::new()
         .add_server("127.0.0.1:4730")
-        .add_server("127.0.0.1:4731").connect().await?;
+        .add_server("127.0.0.1:4731")
+        .connect()
+        .await?;
     println!("Connected!");
     println!("Echo: {:?}", client.echo(b"blah").await);
     let mut jobs = Vec::new();
     for x in 0..10 {
         let payload = format!("payload{}", x);
         jobs.push(client.submit("reverse", payload.as_bytes()).await?);
     }
-    println!("Submitted {}", jobs.iter().map(|j| format!("{}", j)).collect::<String>());
+    println!(
+        "Submitted {}",
+        jobs.iter().map(|j| format!("{}", j)).collect::<String>()
+    );
     for job in jobs.iter_mut() {
         let response = job.response().await;
-        println!("Response for [{:?}] is [{:?}]",
-            job.handle(),
-            response)
-    };
+        println!("Response for [{:?}] is [{:?}]", job.handle(), response)
+    }
     Ok(())
 }

rustygear/examples/multiserver.rs

@@ -1,9 +1,15 @@
-use std::{collections::HashMap, sync::{Arc, Mutex, MutexGuard, RwLock}};
+use std::{
+    collections::HashMap,
+    sync::{Arc, Mutex, MutexGuard, RwLock},
+};
 
 use bytes::Bytes;
-use tokio::sync::mpsc::{Sender, Receiver, channel};
+use tokio::sync::mpsc::{channel, Receiver, Sender};
 
-use crate::{client::{WorkUpdate, WorkerJob, JobStatus}, conn::ServerHandle};
+use crate::{
+    client::{JobStatus, WorkUpdate, WorkerJob},
+    conn::ServerHandle,
+};
 
 pub type JobCreated = ServerHandle;
 
@@ -55,7 +61,10 @@ pub struct ClientData {
 
 impl Clone for ClientData {
     fn clone(&self) -> Self {
-        Self { receivers: self.receivers.clone(), senders: self.senders.clone() }
+        Self {
+            receivers: self.receivers.clone(),
+            senders: self.senders.clone(),
+        }
     }
 }
 
@@ -67,7 +76,7 @@ impl ClientReceivers {
         error_rx: Receiver<(Bytes, Bytes)>,
         worker_job_rx: Receiver<WorkerJob>,
     ) -> ClientReceivers {
-        ClientReceivers{
+        ClientReceivers {
             echo_rx: echo_rx,
             job_created_rx: job_created_rx,
             status_res_rx: status_res_rx,
@@ -87,8 +96,20 @@ impl ClientData {
         let (error_tx, error_rx) = channel(CLIENT_CHANNEL_BOUND_SIZE);
         let (worker_job_tx, worker_job_rx) = channel(CLIENT_CHANNEL_BOUND_SIZE);
         ClientData {
-            receivers: Arc::new(Mutex::new(ClientReceivers::new(echo_rx, job_created_rx, status_res_rx, error_rx, worker_job_rx))),
-            senders: Arc::new(RwLock::new(ClientSenders::new(echo_tx, job_created_tx, status_res_tx, error_tx, worker_job_tx))),
+            receivers: Arc::new(Mutex::new(ClientReceivers::new(
+                echo_rx,
+                job_created_rx,
+                status_res_rx,
+                error_rx,
+                worker_job_rx,
+            ))),
+            senders: Arc::new(RwLock::new(ClientSenders::new(
+                echo_tx,
+                job_created_tx,
+                status_res_tx,
+                error_tx,
+                worker_job_tx,
+            ))),
         }
     }
 
@@ -125,7 +146,11 @@ impl ClientData {
     }
 
     pub fn set_sender_by_handle(&mut self, handle: ServerHandle, tx: Sender<WorkUpdate>) {
-        self.senders.write().unwrap().senders_by_handle.insert(handle, tx);
+        self.senders
+            .write()
+            .unwrap()
+            .senders_by_handle
+            .insert(handle, tx);
     }
 
     pub fn get_jobs_tx_by_func(&self, func: &Vec<u8>) -> Option<Sender<WorkerJob>> {
@@ -136,6 +161,10 @@ impl ClientData {
     }
 
     pub fn set_jobs_tx_by_func(&mut self, func: Vec<u8>, tx: Sender<WorkerJob>) {
-        self.senders.write().unwrap().jobs_tx_by_func.insert(func, tx);
+        self.senders
+            .write()
+            .unwrap()
+            .jobs_tx_by_func
+            .insert(func, tx);
     }
-}
+}

rustygear/src/clientdata.rs

@@ -1,7 +1,7 @@
 [package]
 name = "rustygeard"
 description = "An experimental, full-featured gearman server."
-version = "0.13.0"
+version = "0.14.0"
 authors = ["Clint Byrum <clint@fewbar.com>"]
 license = "Apache-2.0"
 edition = "2018"
@@ -13,7 +13,7 @@ tls = ["dep:tokio-rustls","dep:rustls-pemfile","rustygear/tls"]
 
 [dependencies]
 bytes = ">=1.1.0"
-rustygear = { path = "../rustygear" , version = ">= 0.13.0" }
+rustygear = { path = "../rustygear" , version = ">= 0.14.0" }
 log = ">=0.4.8"
 env_logger = { version = ">=0.10.1" , features = ["auto-color", "humantime"] }
 tokio = { version = "1.37.0", features = ["full"] }

rustygeard/Cargo.toml

@@ -3,11 +3,11 @@ use std::net::SocketAddr;
 use bytes::{BufMut, Bytes, BytesMut};
 
 use rustygear::codec::Packet;
-use rustygear::constants::{PRIORITY_HIGH, PRIORITY_NORMAL, PRIORITY_LOW};
+use rustygear::constants::{PRIORITY_HIGH, PRIORITY_LOW, PRIORITY_NORMAL};
 
 use crate::queues::SharedJobStorage;
+use crate::service::{GearmanService, WorkersByConnId};
 use crate::worker::{SharedWorkers, Wake};
-use crate::service::{WorkersByConnId, GearmanService};
 
 pub fn admin_command_status(storage: SharedJobStorage, workers: SharedWorkers) -> Packet {
     let mut response = BytesMut::with_capacity(1024 * 1024); // XXX Wild guess.
@@ -83,19 +83,17 @@ pub fn admin_command_workers(workers: WorkersByConnId) -> Packet {
 pub fn admin_command_shutdown(service: &GearmanService, addr: &SocketAddr) -> Packet {
     // For now we only allow this on localhost.
     if match addr {
-        SocketAddr::V6(addr) => {
-            addr.to_string().starts_with("[::1]")
-        },
-        SocketAddr::V4(addr) => {
-            addr.to_string().starts_with("127.0.0.")
-        }
+        SocketAddr::V6(addr) => addr.to_string().starts_with("[::1]"),
+        SocketAddr::V4(addr) => addr.to_string().starts_with("127.0.0."),
     } {
         service.shutdown_service();
-        return Packet::new_text_res(Bytes::from("BYE\n"))
+        return Packet::new_text_res(Bytes::from("BYE\n"));
     }
     return Packet::new_text_res(Bytes::from(format!("ERR: Not allowed from {:?}\n", addr)));
 }
 
 pub fn admin_command_unknown() -> Packet {
-    Packet::new_text_res(Bytes::from_static(b"ERR UNKNOWN_COMMAND Unknown+server+command\n"))
+    Packet::new_text_res(Bytes::from_static(
+        b"ERR UNKNOWN_COMMAND Unknown+server+command\n",
+    ))
 }

rustygeard/src/admin.rs

@@ -3,8 +3,8 @@ extern crate wrappinghashset;
 use self::wrappinghashset::{Iter, WrappingHashSet};
 
 use std::collections::{HashMap, HashSet};
-use std::sync::{Arc, Mutex};
 use std::net::SocketAddr;
+use std::sync::{Arc, Mutex};
 
 use bytes::Bytes;