Skip to content

Commit 73a6104

Browse files
committed
cargo format code
just rustup format code Signed-off-by: yuqitao <[email protected]>
1 parent b13d3fd commit 73a6104

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

src/sync/server.rs

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
//! Sync server of ttrpc.
16-
//!
16+
//!
1717
1818
#[cfg(unix)]
1919
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
@@ -23,16 +23,16 @@ use std::collections::HashMap;
2323
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
2424
use std::sync::mpsc::{channel, sync_channel, Receiver, Sender, SyncSender};
2525
use std::sync::{Arc, Mutex};
26+
use std::thread;
2627
use std::thread::JoinHandle;
27-
use std::{thread};
2828

2929
use super::utils::response_to_channel;
3030
use crate::context;
3131
use crate::error::{get_status, Error, Result};
3232
use crate::proto::{Code, MessageHeader, Request, Response, MESSAGE_TYPE_REQUEST};
3333
use crate::sync::channel::{read_message, write_message};
34+
use crate::sync::sys::{PipeConnection, PipeListener};
3435
use crate::{MethodHandler, TtrpcContext};
35-
use crate::sync::sys::{PipeListener, PipeConnection};
3636

3737
// poll_queue will create WAIT_THREAD_COUNT_DEFAULT threads in begin.
3838
// If wait thread count < WAIT_THREAD_COUNT_MIN, create number to WAIT_THREAD_COUNT_DEFAULT.
@@ -64,7 +64,7 @@ struct Connection {
6464
}
6565

6666
impl Connection {
67-
fn close (&self) {
67+
fn close(&self) {
6868
self.connection.close().unwrap_or(());
6969
}
7070

@@ -77,7 +77,7 @@ impl Connection {
7777
}
7878

7979
struct ThreadS<'a> {
80-
connection: &'a Arc<PipeConnection>,
80+
connection: &'a Arc<PipeConnection>,
8181
fdlock: &'a Arc<Mutex<()>>,
8282
wtc: &'a Arc<AtomicUsize>,
8383
quit: &'a Arc<AtomicBool>,
@@ -300,7 +300,7 @@ impl Server {
300300
}
301301

302302
let listener = PipeListener::new_from_fd(fd)?;
303-
303+
304304
self.listeners.push(Arc::new(listener));
305305

306306
Ok(self)
@@ -339,8 +339,6 @@ impl Server {
339339

340340
self.listener_quit_flag.store(false, Ordering::SeqCst);
341341

342-
343-
344342
let listener = self.listeners[0].clone();
345343
let methods = self.methods.clone();
346344
let default = self.thread_count_default;
@@ -383,15 +381,13 @@ impl Server {
383381
let handler = thread::Builder::new()
384382
.name("listener_loop".into())
385383
.spawn(move || {
386-
loop {
384+
loop {
387385
trace!("listening...");
388386
let pipe_connection = match listener.accept(&listener_quit_flag) {
389387
Ok(None) => {
390388
continue;
391389
}
392-
Ok(Some(conn)) => {
393-
Arc::new(conn)
394-
}
390+
Ok(Some(conn)) => Arc::new(conn),
395391
Err(e) => {
396392
error!("listener accept got {:?}", e);
397393
break;
@@ -505,12 +501,10 @@ impl Server {
505501
pub fn stop_listen(mut self) -> Self {
506502
self.listener_quit_flag.store(true, Ordering::SeqCst);
507503

508-
self.listeners[0].close().unwrap_or_else(|e| {
509-
warn!(
510-
"failed to close connection with error: {}", e
511-
)
512-
});
513-
504+
self.listeners[0]
505+
.close()
506+
.unwrap_or_else(|e| warn!("failed to close connection with error: {}", e));
507+
514508
info!("close monitor");
515509
if let Some(handler) = self.handler.take() {
516510
handler.join().unwrap();

0 commit comments

Comments
 (0)