Skip to content

Commit 316f29c

Browse files
authored
Merge pull request #31 from cherish-ltt/v1.1.x
V1.1.8
2 parents a897a20 + 15b9ae1 commit 316f29c

File tree

6 files changed

+33
-18
lines changed

6 files changed

+33
-18
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "lynn_tcp"
3-
version = "1.1.7"
4-
edition = "2021"
5-
rust-version = "1.83"
3+
version = "1.1.8"
4+
edition = "2024"
5+
rust-version = "1.85"
66
authors = ["lynn_tcp Contributors"]
77
license = "MIT"
88
readme = "README.md"

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ Use `cargo add lynn_tcp` or:
3636

3737
```rust
3838
[dependencies]
39-
lynn_tcp = "1.1.7"
39+
lynn_tcp = "1.1.8"
4040
```
4141

4242
**server feature**
4343

4444
```rust
4545
[dependencies]
46-
lynn_tcp = { version = "1.1.7" , features = "server" }
46+
lynn_tcp = { version = "1.1.8" , features = "server" }
4747
```
4848

4949
**client feature**
5050

5151
```rust
5252
[dependencies]
53-
lynn_tcp = { version = "1.1.7" , features = "client" }
53+
lynn_tcp = { version = "1.1.8" , features = "client" }
5454
```
5555

5656
#### Server
@@ -60,6 +60,8 @@ use lynn_tcp::{lynn_server::*, lynn_tcp_dependents::*};
6060

6161
#[tokio::main]
6262
async fn main() -> Result<(), Box<dyn std::error::Error>> {
63+
// Initialize tracing or use app.logserver()
64+
tracing_subscriber::fmt::init();
6365
let _ = LynnServer::new()
6466
.await
6567
.add_router(1, my_service)
@@ -92,6 +94,8 @@ use lynn_tcp::{lynn_server::*, lynn_tcp_dependents::*};
9294

9395
#[tokio::main]
9496
async fn main() -> Result<(), Box<dyn std::error::Error>> {
97+
// Initialize tracing or use app.logserver()
98+
tracing_subscriber::fmt::init();
9599
let _ = LynnServer::new_with_config(
96100
LynnServerConfigBuilder::new()
97101
.with_addr("0.0.0.0:9177")
@@ -138,7 +142,9 @@ use lynn_tcp::{
138142

139143
#[tokio::main]
140144
async fn main() -> Result<(), Box<dyn std::error::Error>> {
141-
let client = LynnClient::new_with_ipv4("127.0.0.1:9177")
145+
// Initialize tracing or use app.logserver()
146+
tracing_subscriber::fmt::init();
147+
let client = LynnClient::new_with_addr("127.0.0.1:9177")
142148
.await
143149
.start()
144150
.await;

src/app/mod.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ pub mod lynn_config_api {
4747
///
4848
/// #[tokio::main]
4949
/// async fn main() -> Result<(), Box<dyn std::error::Error>> {
50+
/// // Initialize tracing or use app.logserver()
51+
/// tracing_subscriber::fmt::init();
5052
/// let _ = LynnServer::new()
5153
/// .await
5254
/// .add_router(1, my_service)
@@ -78,6 +80,8 @@ pub mod lynn_config_api {
7880
///
7981
/// #[tokio::main]
8082
/// async fn main() -> Result<(), Box<dyn std::error::Error>> {
83+
/// // Initialize tracing or use app.logserver()
84+
/// tracing_subscriber::fmt::init();
8185
/// let _ = LynnServer::new_with_config(
8286
/// LynnServerConfigBuilder::new()
8387
/// .with_addr("0.0.0.0:9177")
@@ -149,7 +153,6 @@ impl<'a> LynnServer<'a> {
149153
lynn_config,
150154
lynn_thread_pool: thread_pool,
151155
};
152-
app.log_server().await;
153156
app
154157
}
155158

@@ -176,7 +179,6 @@ impl<'a> LynnServer<'a> {
176179
lynn_config,
177180
lynn_thread_pool: thread_pool,
178181
};
179-
app.log_server().await;
180182
app
181183
}
182184

@@ -203,7 +205,6 @@ impl<'a> LynnServer<'a> {
203205
lynn_config,
204206
lynn_thread_pool: thread_pool,
205207
};
206-
app.log_server().await;
207208
app
208209
}
209210

@@ -226,7 +227,6 @@ impl<'a> LynnServer<'a> {
226227
lynn_config,
227228
lynn_thread_pool: thread_pool,
228229
};
229-
app.log_server().await;
230230
app
231231
}
232232

@@ -390,7 +390,9 @@ impl<'a> LynnServer<'a> {
390390
}
391391

392392
/// Logs server information.
393-
async fn log_server(&self) {
393+
/// since v1.1.8 Users need to manually activate it
394+
#[cfg(feature = "server")]
395+
pub fn log_server(&self) {
394396
let subscriber = fmt::Subscriber::builder()
395397
.with_max_level(Level::INFO)
396398
.finish();

src/client/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ pub mod client_config {
3131
///
3232
/// #[tokio::main]
3333
/// async fn main() -> Result<(), Box<dyn std::error::Error>> {
34-
/// let client = LynnClient::new_with_ipv4("127.0.0.1:9177")
34+
/// // Initialize tracing or use app.logserver()
35+
/// tracing_subscriber::fmt::init();
36+
/// let client = LynnClient::new_with_addr("127.0.0.1:9177")
3537
/// .await
3638
/// .start()
3739
/// .await;
@@ -69,7 +71,6 @@ impl<'a> LynnClient<'a> {
6971
tx_write: None,
7072
rx_read: None,
7173
};
72-
client.log_server().await;
7374
client
7475
}
7576

@@ -92,7 +93,6 @@ impl<'a> LynnClient<'a> {
9293
tx_write: None,
9394
rx_read: None,
9495
};
95-
client.log_server().await;
9696
client
9797
}
9898

@@ -117,7 +117,6 @@ impl<'a> LynnClient<'a> {
117117
tx_write: None,
118118
rx_read: None,
119119
};
120-
client.log_server().await;
121120
client
122121
}
123122

@@ -188,7 +187,9 @@ impl<'a> LynnClient<'a> {
188187
}
189188

190189
/// Logs the server information.
191-
pub(crate) async fn log_server(&self) {
190+
/// since v1.1.8 Users need to manually activate it
191+
#[cfg(feature = "client")]
192+
pub fn log_server(&self) {
192193
let subscriber = fmt::Subscriber::builder()
193194
.with_max_level(Level::INFO)
194195
.finish();

version.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
### v1.1.x - release
44

5+
#### v1.1.8 - release
6+
7+
1.perf
8+
9+
- logserver(Server and Clinet) Now users need to manually initialize the logs
10+
511
#### v1.1.7 - release
612

713
1.feat

0 commit comments

Comments
 (0)