Skip to content

Refactor register to skip panic. #4

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Refactor register to skip panic. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36a538f
refactor register to pass panic.
damonxue Oct 9, 2024
923513c
refactor register to pass panic.
damonxue Oct 9, 2024
d74530f
refactor register to pass panic. + 1
damonxue Oct 10, 2024
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
12 changes: 8 additions & 4 deletions shenyu-client-rust/src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@ impl ShenyuClient {
/// Register to shenyu admin.
pub fn register(&self) -> Result<(), Error> {
if let Ok(token) = self.get_register_token() {
info!(
"[SUCCESS], get register token success, register token: {:#?}",
&token
);
_ = self
.headers
.insert("X-Access-Token".to_string(), token.to_string());
} else {
return Err(Error::new(ErrorKind::Other, "Can't get register token"));
error!("Can't get register token");
}
self.register_all_metadata(true);
self.register_uri();
Expand Down Expand Up @@ -316,7 +320,7 @@ impl ShenyuClient {
if let Ok(true) = self.request(url, &json_data) {
info!(
"[SUCCESS], register metadata success, register data: {:#?}",
json_data
&json_data
);
continue;
}
Expand Down Expand Up @@ -355,7 +359,7 @@ impl ShenyuClient {
if let Ok(true) = self.request(url, &json_data) {
info!(
"[SUCCESS], register discover config success, register data: {:#?}",
json_data
&json_data
);
continue;
}
Expand Down Expand Up @@ -389,7 +393,7 @@ impl ShenyuClient {
if let Ok(true) = self.request(url, &json_data) {
info!(
"[SUCCESS], offline success, register data: {:#?}",
json_data
&json_data
);
continue;
}
Expand Down
42 changes: 4 additions & 38 deletions shenyu-client-rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,25 +427,8 @@ mod tests_axum {
let res = ShenyuClient::new(config, app.app_name(), app.uri_infos(), 9527);
assert!(&res.is_ok());
let client = &mut res.unwrap();
println!(
"shenyu-client-rust.token: {:?}",
client
.headers
.get("X-Access-Token")
.map(|r| r.clone())
.unwrap_or("None".to_string())
);

if let Ok(token) = client.get_register_token() {
_ = client
.headers
.insert("X-Access-Token".to_string(), token.to_string());
} else {
panic!("Can't get register token");
}
client.register_all_metadata(true);
client.register_uri();
client.register_discovery_config();

client.register().unwrap();
client.offline_register();
}

Expand Down Expand Up @@ -478,25 +461,8 @@ mod tests_actix_web {
let res = ShenyuClient::new(config, app.app_name(), app.uri_infos(), 9527);
assert!(&res.is_ok());
let client = &mut res.unwrap();
println!(
"shenyu-client-rust.token: {:?}",
client
.headers
.get("X-Access-Token")
.map(|r| r.clone())
.unwrap_or("None".to_string())
);

if let Ok(token) = client.get_register_token() {
_ = client
.headers
.insert("X-Access-Token".to_string(), token.to_string());
} else {
panic!("Can't get register token");
}
client.register_all_metadata(true);
client.register_uri();
client.register_discovery_config();

client.register().unwrap();
client.offline_register();
}
}
Loading