Skip to content

Commit

Permalink
Add 'go-slog' into server URLs so they will match the github pages co…
Browse files Browse the repository at this point in the history
…nfiguration
  • Loading branch information
mAdkins committed Feb 15, 2024
1 parent 6fdc369 commit cf35d86
Show file tree
Hide file tree
Showing 24 changed files with 180 additions and 180 deletions.
4 changes: 2 additions & 2 deletions cmd/server/embed/choices.tmpl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script>
function testChoice(form) {
window.location.href = "/test/" + form.tag.value + ".html";
window.location.href = "/go-slog/test/" + form.tag.value + ".html";
return true;
}
function hdlrChoice(form) {
window.location.href = "/handler/" + form.tag.value + ".html";
window.location.href = "/go-slog/handler/" + form.tag.value + ".html";
return true;
}
</script>
Expand Down
12 changes: 6 additions & 6 deletions cmd/server/embed/handler.tmpl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Handler {{ .Data.HandlerName .Handler }}</h1>
</td>
<td align="right">
Expand Down Expand Up @@ -43,12 +43,12 @@
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/{{ .Handler }}/Nanos.svg" alt="{{ .Data.HandlerName .Handler }} Ns/Op" class="chart" /></td>
<td><img src="/chart/{{ .Handler }}/MemAllocs.svg" alt="{{ .Data.HandlerName .Handler }} Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Handler }}/Nanos.svg" alt="{{ .Data.HandlerName .Handler }} Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Handler }}/MemAllocs.svg" alt="{{ .Data.HandlerName .Handler }} Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/{{ .Handler }}/MemBytes.svg" alt="{{ .Data.HandlerName .Handler }} Bytes/Op" class="chart" /></td>
<td><img src="/chart/{{ .Handler }}/GbPerSec.svg" alt="{{ .Data.HandlerName .Handler }} GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Handler }}/MemBytes.svg" alt="{{ .Data.HandlerName .Handler }} Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Handler }}/GbPerSec.svg" alt="{{ .Data.HandlerName .Handler }} GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
6 changes: 3 additions & 3 deletions cmd/server/embed/root.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>Benchmarks</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
Expand All @@ -11,7 +11,7 @@
<legend>Tests</legend>
<table>
{{ range .Data.TestTags }}
<tr><td><a href="test/{{ . }}.html">{{ $.Data.TestName . }}</a></td></tr>
<tr><td><a href="/go-slog/test/{{ . }}.html">{{ $.Data.TestName . }}</a></td></tr>
{{ end }}
</table>
</fieldset>
Expand All @@ -20,7 +20,7 @@
<legend>Handlers</legend>
<table>
{{ range .Data.HandlerTags }}
<tr><td><a href="handler/{{ . }}.html">{{ $.Data.HandlerName . }}</a></td></tr>
<tr><td><a href="/go-slog/handler/{{ . }}.html">{{ $.Data.HandlerName . }}</a></td></tr>
{{ end }}
</table>
</fieldset>
Expand Down
12 changes: 6 additions & 6 deletions cmd/server/embed/test.tmpl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Test {{ .Data.TestName .Test }}</h1>
</td>
<td align="right">
Expand Down Expand Up @@ -43,12 +43,12 @@
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/{{ .Test }}/Nanos.svg" alt="{{ .Data.TestName .Test }} Ns/Op" class="chart" /></td>
<td><img src="/chart/{{ .Test }}/MemAllocs.svg" alt="{{ .Data.TestName .Test }} Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Test }}/Nanos.svg" alt="{{ .Data.TestName .Test }} Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Test }}/MemAllocs.svg" alt="{{ .Data.TestName .Test }} Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/{{ .Test }}/MemBytes.svg" alt="{{ .Data.TestName .Test }} Bytes/Op" class="chart" /></td>
<td><img src="/chart/{{ .Test }}/GbPerSec.svg" alt="{{ .Data.TestName .Test }} GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Test }}/MemBytes.svg" alt="{{ .Data.TestName .Test }} Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/{{ .Test }}/GbPerSec.svg" alt="{{ .Data.TestName .Test }} GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
16 changes: 8 additions & 8 deletions cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ func main() {

router := gin.Default()
rootPageFn := pageFunction(pageRoot)
router.GET("/", rootPageFn)
router.GET("/index.html", rootPageFn)
router.GET("/test/:tag", pageFunction(pageTest))
router.GET("/handler/:tag", pageFunction(pageHandler))
router.GET("/chart/:tag/:item", chartFunction)
router.GET("/home.svg", svgFunction(home))
router.GET("/style.css", textFunction(css))
router.GET("/go-slog/", rootPageFn)
router.GET("/go-slog/index.html", rootPageFn)
router.GET("/go-slog/test/:tag", pageFunction(pageTest))
router.GET("/go-slog/handler/:tag", pageFunction(pageHandler))
router.GET("/go-slog/chart/:tag/:item", chartFunction)
router.GET("/go-slog/home.svg", svgFunction(home))
router.GET("/go-slog/style.css", textFunction(css))

if err := router.SetTrustedProxies(nil); err != nil {
slog.Error("Don't trust proxies", "err", err)
os.Exit(1)
}

// Listen and serve on 0.0.0.0:8080 (for windows "localhost:8080"). {
slog.Info("Web Server @ http://localhost:8080")
slog.Info("Web Server @ http://localhost:8080/go-slog")
if err := router.Run(); err != nil {
slog.Error("Error during ListenAndServe()", "err", err)
}
Expand Down
16 changes: 8 additions & 8 deletions docs/handler/darvaza_zerolog.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Handler Darvaza Zerolog</h1>
</td>
<td align="right">
<script>
function testChoice(form) {
window.location.href = "/test/" + form.tag.value + ".html";
window.location.href = "/go-slog/test/" + form.tag.value + ".html";
return true;
}
function hdlrChoice(form) {
window.location.href = "/handler/" + form.tag.value + ".html";
window.location.href = "/go-slog/handler/" + form.tag.value + ".html";
return true;
}
</script>
Expand Down Expand Up @@ -164,12 +164,12 @@ <h1 class="home">Handler Darvaza Zerolog</h1>
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/darvaza_zerolog/Nanos.svg" alt="Darvaza Zerolog Ns/Op" class="chart" /></td>
<td><img src="/chart/darvaza_zerolog/MemAllocs.svg" alt="Darvaza Zerolog Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/darvaza_zerolog/Nanos.svg" alt="Darvaza Zerolog Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/darvaza_zerolog/MemAllocs.svg" alt="Darvaza Zerolog Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/darvaza_zerolog/MemBytes.svg" alt="Darvaza Zerolog Bytes/Op" class="chart" /></td>
<td><img src="/chart/darvaza_zerolog/GbPerSec.svg" alt="Darvaza Zerolog GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/darvaza_zerolog/MemBytes.svg" alt="Darvaza Zerolog Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/darvaza_zerolog/GbPerSec.svg" alt="Darvaza Zerolog GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
16 changes: 8 additions & 8 deletions docs/handler/phsym_zerolog.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Handler Phsym Zerolog</h1>
</td>
<td align="right">
<script>
function testChoice(form) {
window.location.href = "/test/" + form.tag.value + ".html";
window.location.href = "/go-slog/test/" + form.tag.value + ".html";
return true;
}
function hdlrChoice(form) {
window.location.href = "/handler/" + form.tag.value + ".html";
window.location.href = "/go-slog/handler/" + form.tag.value + ".html";
return true;
}
</script>
Expand Down Expand Up @@ -209,12 +209,12 @@ <h1 class="home">Handler Phsym Zerolog</h1>
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/phsym_zerolog/Nanos.svg" alt="Phsym Zerolog Ns/Op" class="chart" /></td>
<td><img src="/chart/phsym_zerolog/MemAllocs.svg" alt="Phsym Zerolog Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/phsym_zerolog/Nanos.svg" alt="Phsym Zerolog Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/phsym_zerolog/MemAllocs.svg" alt="Phsym Zerolog Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/phsym_zerolog/MemBytes.svg" alt="Phsym Zerolog Bytes/Op" class="chart" /></td>
<td><img src="/chart/phsym_zerolog/GbPerSec.svg" alt="Phsym Zerolog GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/phsym_zerolog/MemBytes.svg" alt="Phsym Zerolog Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/phsym_zerolog/GbPerSec.svg" alt="Phsym Zerolog GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
16 changes: 8 additions & 8 deletions docs/handler/samber_zap.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Handler Samber Zap</h1>
</td>
<td align="right">
<script>
function testChoice(form) {
window.location.href = "/test/" + form.tag.value + ".html";
window.location.href = "/go-slog/test/" + form.tag.value + ".html";
return true;
}
function hdlrChoice(form) {
window.location.href = "/handler/" + form.tag.value + ".html";
window.location.href = "/go-slog/handler/" + form.tag.value + ".html";
return true;
}
</script>
Expand Down Expand Up @@ -209,12 +209,12 @@ <h1 class="home">Handler Samber Zap</h1>
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/samber_zap/Nanos.svg" alt="Samber Zap Ns/Op" class="chart" /></td>
<td><img src="/chart/samber_zap/MemAllocs.svg" alt="Samber Zap Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zap/Nanos.svg" alt="Samber Zap Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zap/MemAllocs.svg" alt="Samber Zap Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/samber_zap/MemBytes.svg" alt="Samber Zap Bytes/Op" class="chart" /></td>
<td><img src="/chart/samber_zap/GbPerSec.svg" alt="Samber Zap GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zap/MemBytes.svg" alt="Samber Zap Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zap/GbPerSec.svg" alt="Samber Zap GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
16 changes: 8 additions & 8 deletions docs/handler/samber_zerolog.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Handler Samber Zerolog</h1>
</td>
<td align="right">
<script>
function testChoice(form) {
window.location.href = "/test/" + form.tag.value + ".html";
window.location.href = "/go-slog/test/" + form.tag.value + ".html";
return true;
}
function hdlrChoice(form) {
window.location.href = "/handler/" + form.tag.value + ".html";
window.location.href = "/go-slog/handler/" + form.tag.value + ".html";
return true;
}
</script>
Expand Down Expand Up @@ -209,12 +209,12 @@ <h1 class="home">Handler Samber Zerolog</h1>
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/samber_zerolog/Nanos.svg" alt="Samber Zerolog Ns/Op" class="chart" /></td>
<td><img src="/chart/samber_zerolog/MemAllocs.svg" alt="Samber Zerolog Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zerolog/Nanos.svg" alt="Samber Zerolog Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zerolog/MemAllocs.svg" alt="Samber Zerolog Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/samber_zerolog/MemBytes.svg" alt="Samber Zerolog Bytes/Op" class="chart" /></td>
<td><img src="/chart/samber_zerolog/GbPerSec.svg" alt="Samber Zerolog GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zerolog/MemBytes.svg" alt="Samber Zerolog Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/samber_zerolog/GbPerSec.svg" alt="Samber Zerolog GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
16 changes: 8 additions & 8 deletions docs/handler/slog_JSONHandler.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<html>
<head>
<title>Benchmark Data</title>
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/go-slog/style.css">
</head>

<body>
<table class="top">
<tr>
<td>
<a href="/index.html"><img src="/home.svg" alt="Home" class="home" /></a>
<a href="/go-slog/index.html"><img src="/go-slog/home.svg" alt="Home" class="home" /></a>
<h1 class="home">Handler Slog JSONHandler</h1>
</td>
<td align="right">
<script>
function testChoice(form) {
window.location.href = "/test/" + form.tag.value + ".html";
window.location.href = "/go-slog/test/" + form.tag.value + ".html";
return true;
}
function hdlrChoice(form) {
window.location.href = "/handler/" + form.tag.value + ".html";
window.location.href = "/go-slog/handler/" + form.tag.value + ".html";
return true;
}
</script>
Expand Down Expand Up @@ -209,12 +209,12 @@ <h1 class="home">Handler Slog JSONHandler</h1>
<td colspan=2 align="center">
<table>
<tr>
<td><img src="/chart/slog_JSONHandler/Nanos.svg" alt="Slog JSONHandler Ns/Op" class="chart" /></td>
<td><img src="/chart/slog_JSONHandler/MemAllocs.svg" alt="Slog JSONHandler Allocs/Op" class="chart" /></td>
<td><img src="/go-slog/chart/slog_JSONHandler/Nanos.svg" alt="Slog JSONHandler Ns/Op" class="chart" /></td>
<td><img src="/go-slog/chart/slog_JSONHandler/MemAllocs.svg" alt="Slog JSONHandler Allocs/Op" class="chart" /></td>
</tr>
<tr>
<td><img src="/chart/slog_JSONHandler/MemBytes.svg" alt="Slog JSONHandler Bytes/Op" class="chart" /></td>
<td><img src="/chart/slog_JSONHandler/GbPerSec.svg" alt="Slog JSONHandler GB/Sec" class="chart" /></td>
<td><img src="/go-slog/chart/slog_JSONHandler/MemBytes.svg" alt="Slog JSONHandler Bytes/Op" class="chart" /></td>
<td><img src="/go-slog/chart/slog_JSONHandler/GbPerSec.svg" alt="Slog JSONHandler GB/Sec" class="chart" /></td>
</tr>
</table>
</td>
Expand Down
Loading

0 comments on commit cf35d86

Please sign in to comment.