Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/compile error #134

Merged
merged 24 commits into from
Apr 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2192217
feat(dubbo): add unix feature
yang20150702 Dec 7, 2022
ea06ca1
Rft: replace feature with target_os cfg
yang20150702 Dec 8, 2022
f172c25
Merge branch 'apache:main' into main
yang20150702 Dec 8, 2022
d40ea72
Merge branch 'apache:main' into main
yang20150702 Dec 9, 2022
5f5b31f
Rft(dubbo): add ClientBuilder for client
yang20150702 Dec 9, 2022
176cb57
Rftï(dubbo-build): add build api for client
yang20150702 Dec 9, 2022
b4db021
style(examples): cargo fmt
yang20150702 Dec 9, 2022
e9e0a67
Rft: move connection from client to transport mod
yang20150702 Dec 20, 2022
e67e59e
Rft(dubbo): add default timeout for client
yang20150702 Dec 26, 2022
7ab187f
Merge branch 'apache:main' into main
yang20150702 Dec 26, 2022
6e8c95e
Merge branch 'apache:main' into main
yang20150702 Dec 27, 2022
e066505
Ftr: add serverBuilder for Server, support multiple ways to start server
yang20150702 Dec 27, 2022
bd4be4e
Rft(examples): update yaml
yang20150702 Dec 27, 2022
80f3502
refactor(dubbo): update invoker trait
yang20150702 Jan 16, 2023
1022b8e
Merge branch 'main' into main
yang20150702 Jan 20, 2023
f403481
Merge branch 'apache:main' into main
yang20150702 Jan 28, 2023
fb6d30c
Merge branch 'apache:main' into main
yang20150702 Feb 9, 2023
00a90ff
Merge branch 'apache:main' into main
yang20150702 Feb 15, 2023
25903fa
Merge branch 'apache:main' into main
yang20150702 Feb 16, 2023
a03b0b5
Merge branch 'apache:main' into main
yang20150702 Feb 20, 2023
41d2ddd
Merge branch 'apache:main' into main
yang20150702 Apr 11, 2023
6b39996
fix: compile error
yang20150702 Apr 11, 2023
5112e9a
style: cargo fmt
yang20150702 Apr 12, 2023
0b3b949
refactor(remoting): add import
yang20150702 Apr 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dubbo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ argh = "0.1"
rustls-pemfile = "1.0.0"
tokio-rustls="0.23.4"
tokio = { version = "1.0", features = [ "rt-multi-thread", "time", "fs", "macros", "net", "signal", "full" ] }
futures-core = "0.3.23"
prost = "0.10.4"
async-trait = "0.1.56"
tower-layer.workspace = true
Expand Down
5 changes: 2 additions & 3 deletions dubbo/src/triple/server/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ use dubbo_base::Url;
use dubbo_logger::tracing;
use http::{Request, Response, Uri};
use hyper::body::Body;
use tower_service::Service;
use tokio_rustls::rustls::{Certificate, PrivateKey};
use tower_service::Service;

use crate::{common::url::Url, triple::transport::DubboServer};
use crate::{utils, BoxBody};
use crate::{triple::transport::DubboServer, utils, BoxBody};

#[derive(Clone, Default, Debug)]
pub struct ServerBuilder {
Expand Down
17 changes: 8 additions & 9 deletions dubbo/src/triple/transport/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,22 @@
* limitations under the License.
*/

use std::io;
use std::net::SocketAddr;
use std::sync::Arc;
use std::{io, net::SocketAddr, sync::Arc};

use dubbo_logger::tracing;
use futures_core::Future;
use http::{Request, Response};
use hyper::body::Body;
use tokio::time::Duration;
use tokio_rustls::{
rustls,
rustls::{Certificate, PrivateKey},
TlsAcceptor,
};
use tower_service::Service;
use tokio_rustls::rustls::{Certificate, PrivateKey};
use tokio_rustls::{rustls, TlsAcceptor};

use super::listener::get_listener;
use super::router::DubboRouter;
use crate::triple::transport::io::BoxIO;
use crate::BoxBody;
use super::{listener::get_listener, router::DubboRouter};
use crate::{triple::transport::io::BoxIO, BoxBody};

#[derive(Default, Clone, Debug)]
pub struct DubboServer {
Expand Down