diff --git a/client/src/main.rs b/client/src/main.rs index cb409a5..97a1277 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -100,19 +100,24 @@ async fn main() -> anyhow::Result<()> { continue; }; if let TunnelEndpoint::Client(client) = endpoint { - if cancel_token.is_cancelled() { - return; - } - let permit = semaphore.clone().acquire_owned().await.unwrap(); - let result = run(client, profile.clone()).await; - match result { - Ok(true) => { - post_task(profile.clone(), permit, cancel_token.clone()).await; + loop { + if client.get_client().await.is_err() { + break; } - Err(error) => { - error!("{}", error); + if cancel_token.is_cancelled() { + return; + } + let permit = semaphore.clone().acquire_owned().await.unwrap(); + let result = run(client.clone(), profile.clone()).await; + match result { + Ok(true) => { + post_task(profile.clone(), permit, cancel_token.clone()).await; + } + Err(error) => { + error!("{}", error); + } + _ => {} } - _ => {} } } } @@ -139,19 +144,24 @@ async fn main() -> anyhow::Result<()> { continue; }; if let TunnelEndpoint::Client(client) = endpoint { - if cancel_token.is_cancelled() { - return; - } - let permit = semaphore.clone().acquire_owned().await.unwrap(); - let result = run(client, profile.clone()).await; - match result { - Ok(true) => { - post_task(profile.clone(), permit, cancel_token.clone()).await; + loop { + if client.get_client().await.is_err() { + break; } - Err(error) => { - error!("{}", error); + if cancel_token.is_cancelled() { + return; + } + let permit = semaphore.clone().acquire_owned().await.unwrap(); + let result = run(client.clone(), profile.clone()).await; + match result { + Ok(true) => { + post_task(profile.clone(), permit, cancel_token.clone()).await; + } + Err(error) => { + error!("{}", error); + } + _ => {} } - _ => {} } } sleep(Duration::from_secs(10)).await; diff --git a/sekai-unpacker-client.yaml b/sekai-unpacker-client.yaml index f45ee8c..dd2ec9c 100644 --- a/sekai-unpacker-client.yaml +++ b/sekai-unpacker-client.yaml @@ -1,9 +1,13 @@ log_level: "DEBUG" -client: - - url: "127.0.0.1:3333" +#client: +# - url: "127.0.0.1:3333" +# token: abc +server: + - url: 127.0.0.1:3333 token: abc - host: "local.bluemangoo.net" + cert: "D:\\WorkDir\\Nginx\\cert\\_.bluemangoo.net\\_.bluemangoo.net-chain.pem" + key: "D:\\WorkDir\\Nginx\\cert\\_.bluemangoo.net\\_.bluemangoo.net-key.pem" profiles: cn: diff --git a/sekai-unpacker-server.yaml b/sekai-unpacker-server.yaml index 354241d..acba243 100644 --- a/sekai-unpacker-server.yaml +++ b/sekai-unpacker-server.yaml @@ -1,10 +1,12 @@ log_level: "DEBUG" -server: - - url: 127.0.0.1:3333 +client: + - url: "127.0.0.1:3333" token: abc - cert: "D:\\WorkDir\\Nginx\\cert\\_.bluemangoo.net\\_.bluemangoo.net-chain.pem" - key: "D:\\WorkDir\\Nginx\\cert\\_.bluemangoo.net\\_.bluemangoo.net-key.pem" + host: "local.bluemangoo.net" +#server: +# - url: 127.0.0.1:3333 +# token: abc execution: proxy: ""