dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix logs containing IPv6 URLs (#9813) 

Merge pull request 9813
This commit is contained in:
printfn 2025-04-25 00:08:00 +12:00 committed by GitHub
parent fa5575c806
commit 01781355ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/commands/serve.rb
View File

@ -243,7 +243,7 @@ module Jekyll
def format_url(ssl_enabled, address, port, baseurl = nil) def format_url(ssl_enabled, address, port, baseurl = nil)
format("%<prefix>s://%<address>s:%<port>i%<baseurl>s", format("%<prefix>s://%<address>s:%<port>i%<baseurl>s",
:prefix => ssl_enabled ? "https" : "http", :prefix => ssl_enabled ? "https" : "http",
:address => address, :address => address.include?(":") ? "[#{address}]" : address,
:port => port, :port => port,
:baseurl => baseurl ? "#{baseurl}/" : "") :baseurl => baseurl ? "#{baseurl}/" : "")
end end

3
lib/jekyll/commands/serve/live_reload_reactor.rb
View File

@ -55,8 +55,9 @@ module Jekyll
EM.schedule { @started_event.set } EM.schedule { @started_event.set }
EM.add_shutdown_hook { @stopped_event.set } EM.add_shutdown_hook { @stopped_event.set }
host = opts["host"].include?(":") ? "[#{opts["host"]}]" : opts["host"]
Jekyll.logger.info "LiveReload address:", Jekyll.logger.info "LiveReload address:",
"http://#{opts["host"]}:#{opts["livereload_port"]}" "http://#{host}:#{opts["livereload_port"]}"
end end
end end
@thread.abort_on_exception = true @thread.abort_on_exception = true