Skip to content

Commit

Permalink
Fixed broken page caching.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikestefanello committed Jun 15, 2024
1 parent 00431e6 commit 678627d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ A service needs to run in order to add periodic tasks to the queue at the specif
```go
go func() {
if err := c.Tasks.StartScheduler(); err != nil {
c.Web.Logger.Fatalf("scheduler shutdown: %v", err)
log.Fatalf("scheduler shutdown: %v", err)
}
}()
```
Expand Down
13 changes: 7 additions & 6 deletions cmd/web/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"crypto/tls"
"fmt"
"log"
"net/http"
"os"
"os/signal"
Expand All @@ -18,13 +19,13 @@ func main() {
c := services.NewContainer()
defer func() {
if err := c.Shutdown(); err != nil {
c.Web.Logger.Fatal(err)
log.Fatal(err)
}
}()

// Build the router
if err := handlers.BuildRouter(c); err != nil {
c.Web.Logger.Fatalf("failed to build the router: %v", err)
log.Fatalf("failed to build the router: %v", err)
}

// Start the server
Expand All @@ -40,7 +41,7 @@ func main() {
if c.Config.HTTP.TLS.Enabled {
certs, err := tls.LoadX509KeyPair(c.Config.HTTP.TLS.Certificate, c.Config.HTTP.TLS.Key)
if err != nil {
c.Web.Logger.Fatalf("cannot load TLS certificate: %v", err)
log.Fatalf("cannot load TLS certificate: %v", err)
}

srv.TLSConfig = &tls.Config{
Expand All @@ -49,14 +50,14 @@ func main() {
}

if err := c.Web.StartServer(&srv); err != http.ErrServerClosed {
c.Web.Logger.Fatalf("shutting down the server: %v", err)
log.Fatalf("shutting down the server: %v", err)
}
}()

// Start the scheduler service to queue periodic tasks
go func() {
if err := c.Tasks.StartScheduler(); err != nil {
c.Web.Logger.Fatalf("scheduler shutdown: %v", err)
log.Fatalf("scheduler shutdown: %v", err)
}
}()

Expand All @@ -68,6 +69,6 @@ func main() {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
if err := c.Web.Shutdown(ctx); err != nil {
c.Web.Logger.Fatal(err)
log.Fatal(err)
}
}
4 changes: 2 additions & 2 deletions pkg/middleware/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ func ServeCachedPage(ch *services.CacheClient) echo.MiddlewareFunc {

if err != nil {
switch {
case errors.Is(err, &libstore.NotFound{}),
context.IsCanceledError(err):
case errors.Is(err, &libstore.NotFound{}):
case context.IsCanceledError(err):
return nil
default:
log.Ctx(c).Error("failed getting cached page",
Expand Down

0 comments on commit 678627d

Please sign in to comment.