From 01781355ef452e06ced54a8164da6afb3db74f75 Mon Sep 17 00:00:00 2001 From: printfn <1643883+printfn@users.noreply.github.com> Date: Fri, 25 Apr 2025 00:08:00 +1200 Subject: [PATCH] Fix logs containing IPv6 URLs (#9813) Merge pull request 9813 --- lib/jekyll/commands/serve.rb | 2 +- lib/jekyll/commands/serve/live_reload_reactor.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 6abd893d..21bfa4d6 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -243,7 +243,7 @@ module Jekyll def format_url(ssl_enabled, address, port, baseurl = nil) format("%s://%
s:%i%s", :prefix => ssl_enabled ? "https" : "http", - :address => address, + :address => address.include?(":") ? "[#{address}]" : address, :port => port, :baseurl => baseurl ? "#{baseurl}/" : "") end diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb index 78f9408f..30e88812 100644 --- a/lib/jekyll/commands/serve/live_reload_reactor.rb +++ b/lib/jekyll/commands/serve/live_reload_reactor.rb @@ -55,8 +55,9 @@ module Jekyll EM.schedule { @started_event.set } EM.add_shutdown_hook { @stopped_event.set } + host = opts["host"].include?(":") ? "[#{opts["host"]}]" : opts["host"] Jekyll.logger.info "LiveReload address:", - "http://#{opts["host"]}:#{opts["livereload_port"]}" + "http://#{host}:#{opts["livereload_port"]}" end end @thread.abort_on_exception = true