Skip to content

Commit 62b2911

Browse files
committed
added local_addr() to listeners to allow random port numbers to be displayed properly in the terminal
Signed-off-by: Garik Asplund <[email protected]>
1 parent 19c3017 commit 62b2911

File tree

1 file changed

+33
-16
lines changed

1 file changed

+33
-16
lines changed

crates/trigger-http/src/lib.rs

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -169,27 +169,12 @@ impl TriggerExecutor for HttpTrigger {
169169
let listen_addr = config.address;
170170
let tls = config.into_tls_config();
171171

172-
// Print startup messages
173-
let scheme = if tls.is_some() { "https" } else { "http" };
174-
let base_url = format!("{}://{:?}", scheme, listen_addr);
175-
terminal::step!("\nServing", "{}", base_url);
176-
log::info!("Serving {}", base_url);
177-
178-
println!("Available Routes:");
179-
for (route, component_id) in self.router.routes() {
180-
println!(" {}: {}{}", component_id, base_url, route);
181-
if let Some(component) = self.engine.app().get_component(component_id) {
182-
if let Some(description) = component.get_metadata(APP_DESCRIPTION_KEY)? {
183-
println!(" {}", description);
184-
}
185-
}
186-
}
187-
188172
if let Some(tls) = tls {
189173
self.serve_tls(listen_addr, tls).await?
190174
} else {
191175
self.serve(listen_addr).await?
192176
};
177+
193178
Ok(())
194179
}
195180

@@ -414,6 +399,22 @@ impl HttpTrigger {
414399
.await
415400
.with_context(|| format!("Unable to listen on {}", listen_addr))?;
416401

402+
// Print startup messages
403+
let scheme = "http";
404+
let base_url = format!("{}://{:?}", scheme, listener.local_addr()?);
405+
terminal::step!("\nServing", "{}", base_url);
406+
log::info!("Serving {}", base_url);
407+
408+
println!("Available Routes:");
409+
for (route, component_id) in self_.router.routes() {
410+
println!(" {}: {}{}", component_id, base_url, route);
411+
if let Some(component) = self_.engine.app().get_component(component_id) {
412+
if let Some(description) = component.get_metadata(APP_DESCRIPTION_KEY)? {
413+
println!(" {}", description);
414+
}
415+
}
416+
}
417+
417418
loop {
418419
let (stream, addr) = listener.accept().await?;
419420
Self::serve_connection(self_.clone(), stream, addr);
@@ -427,6 +428,22 @@ impl HttpTrigger {
427428
.await
428429
.with_context(|| format!("Unable to listen on {}", listen_addr))?;
429430

431+
// Print startup messages
432+
let scheme = "https";
433+
let base_url = format!("{}://{:?}", scheme, listener.local_addr()?);
434+
terminal::step!("\nServing", "{}", base_url);
435+
log::info!("Serving {}", base_url);
436+
437+
println!("Available Routes:");
438+
for (route, component_id) in self_.router.routes() {
439+
println!(" {}: {}{}", component_id, base_url, route);
440+
if let Some(component) = self_.engine.app().get_component(component_id) {
441+
if let Some(description) = component.get_metadata(APP_DESCRIPTION_KEY)? {
442+
println!(" {}", description);
443+
}
444+
}
445+
}
446+
430447
let acceptor = tls.server_config()?;
431448

432449
loop {

0 commit comments

Comments
 (0)