From 9d7abc9eda4949514d131c4dde879534a02b1ddc Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 8 Dec 2023 21:10:31 -0700 Subject: [PATCH] Minor tweaks --- src/features.html | 4 ++-- src/resources/demo.cast | 25 ++++++++++--------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/features.html b/src/features.html index f9c7a27..be40fda 100644 --- a/src/features.html +++ b/src/features.html @@ -83,10 +83,10 @@

Compile time

- On consumer hardware, standard Caddy builds compile in just a few seconds. This is crucial for rapid iteration, plugin development, and low-cost deployments. + On consumer hardware, standard Caddy builds compile in just a few seconds. This is crucial for rapid iteration, plugin development, and low-cost deployments. Other servers written in C/C++ can take several minutes.
- 5 seconds + ~30 seconds cold build,
~2 seconds hot
diff --git a/src/resources/demo.cast b/src/resources/demo.cast index 28e4732..44d77b2 100644 --- a/src/resources/demo.cast +++ b/src/resources/demo.cast @@ -833,21 +833,16 @@ [115.285824, "o", "o"] [115.345733, "o", "a"] [115.405768, "o", "d"] -[115.547794, "o", "\r\n\u001b[?2004l\r"] -[115.565363, "o", "2023/12/08 20:36:01.316\t\u001b[34mINFO\u001b[0m\tusing adjacent Caddyfile\r\n"] -[115.566727, "o", "2023/12/08 20:36:01.317\t\u001b[34mINFO\u001b[0m\tadmin.api\treceived request\t{\"method\": \"POST\", \"host\": \"localhost:2019\", \"uri\": \"/load\", \"remote_ip\": \"127.0.0.1\", \"remote_port\": \"56890\", \"headers\": {\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"411\"],\"Content-Type\":[\"application/json\"],\"Origin\":[\"http://localhost:2019\"],\"User-Agent\":[\"Go-http-client/1.1\"]}}\r\n"] -[115.567161, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\tadmin\tadmin endpoint started\t{\"address\": \"localhost:2019\", \"enforce_origin\": false, \"origins\": [\"//localhost:2019\", \"//[::1]:2019\", \"//127.0.0.1:2019\"]}\r\n"] -[115.567246, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.auto_https\tserver is listening only on the HTTPS port but has no TLS connection policies; adding one to enable TLS\t{\"server_name\": \"srv0\", \"https_port\": 443}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.auto_https\tenabling automatic HTTP->HTTPS redirects\t{\"server_name\": \"srv0\"}\r\n"] -[115.567352, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp\tenabling HTTP/3 listener\t{\"addr\": \":443\"}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.log\tserver running\t{\"name\": \"srv0\", \"protocols\": [\"h1\", \"h2\", \"h3\"]}\r\n"] -[115.567385, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.log\tserver running\t{\"name\": \"remaining_auto_https_redirects\", \"protocols\": [\"h1\", \"h2\", \"h3\"]}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp\tenabling automatic TLS certificate management\t{\"domains\": [\"caddy.dyanim.com\"]}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp\tservers shutting down with eternal grace period\r\n"] -[115.567626, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\tautosaved config (load with --resume flag)\t{\"file\": \"/home/matt/.config/caddy/autosave.json\"}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\tadmin.api\tload complete\r\n"] -[115.568896, "o", "\u001b]0;matt@shadowfax:~/demo\u0007"] -[115.568974, "o", "\u001b[?2004h\r\r\n\u001b[90m╔[\u001b[96mmatt\u001b[90m@\u001b[32;1mshadowfax\u001b[90m:\u001b[m\u001b[36m~/demo\u001b[90m]\r\r\n╚>\u001b[m$ "] -[115.569426, "o", "2023/12/08 20:36:01.320\t\u001b[34mINFO\u001b[0m\tadmin\tstopped previous server\t{\"address\": \"localhost:2019\"}\r\n"] -[118.327615, "o", "\r\n\u001b[?2004l\r"] -[118.327744, "o", "\u001b]0;matt@shadowfax:~/demo\u0007"] -[118.327793, "o", "\u001b[?2004h\r\r\n\u001b[90m╔[\u001b[96mmatt\u001b[90m@\u001b[32;1mshadowfax\u001b[90m:\u001b[m\u001b[36m~/demo\u001b[90m]\r\r\n"] -[118.327837, "o", "╚>\u001b[m$ "] +[116.547794, "o", "\r\n\u001b[?2004l\r"] +[116.565363, "o", "2023/12/08 20:36:01.316\t\u001b[34mINFO\u001b[0m\tusing adjacent Caddyfile\r\n"] +[116.566727, "o", "2023/12/08 20:36:01.317\t\u001b[34mINFO\u001b[0m\tadmin.api\treceived request\t{\"method\": \"POST\", \"host\": \"localhost:2019\", \"uri\": \"/load\", \"remote_ip\": \"127.0.0.1\", \"remote_port\": \"56890\", \"headers\": {\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"411\"],\"Content-Type\":[\"application/json\"],\"Origin\":[\"http://localhost:2019\"],\"User-Agent\":[\"Go-http-client/1.1\"]}}\r\n"] +[116.567161, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\tadmin\tadmin endpoint started\t{\"address\": \"localhost:2019\", \"enforce_origin\": false, \"origins\": [\"//localhost:2019\", \"//[::1]:2019\", \"//127.0.0.1:2019\"]}\r\n"] +[116.567246, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.auto_https\tserver is listening only on the HTTPS port but has no TLS connection policies; adding one to enable TLS\t{\"server_name\": \"srv0\", \"https_port\": 443}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.auto_https\tenabling automatic HTTP->HTTPS redirects\t{\"server_name\": \"srv0\"}\r\n"] +[116.567352, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp\tenabling HTTP/3 listener\t{\"addr\": \":443\"}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.log\tserver running\t{\"name\": \"srv0\", \"protocols\": [\"h1\", \"h2\", \"h3\"]}\r\n"] +[116.567385, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp.log\tserver running\t{\"name\": \"remaining_auto_https_redirects\", \"protocols\": [\"h1\", \"h2\", \"h3\"]}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp\tenabling automatic TLS certificate management\t{\"domains\": [\"caddy.dyanim.com\"]}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\thttp\tservers shutting down with eternal grace period\r\n"] +[116.567626, "o", "2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\tautosaved config (load with --resume flag)\t{\"file\": \"/home/matt/.config/caddy/autosave.json\"}\r\n2023/12/08 20:36:01.318\t\u001b[34mINFO\u001b[0m\tadmin.api\tload complete\r\n"] +[116.568974, "o", "2023/12/08 20:36:01.320\t\u001b[34mINFO\u001b[0m\tadmin\tstopped previous server\t{\"address\": \"localhost:2019\"}\r\n"] +[116.569426, "o", "\u001b[?2004h\r\r\n\u001b[90m╔[\u001b[96mmatt\u001b[90m@\u001b[32;1mshadowfax\u001b[90m:\u001b[m\u001b[36m~/demo\u001b[90m]\r\r\n╚>\u001b[m$ "] [118.891774, "o", "c"] [118.971678, "o", "u"] [119.091636, "o", "r"]