camzalewski/personal-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Minor cleanup.

Browse source
This commit is contained in:
mikestefanello 2021-12-19 16:34:19 -05:00
parent 28bda89863
commit d2ce5c34c4
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
controller/controller.go
View file

@ -73,7 +73,7 @@ func (t *Controller) RenderPage(c echo.Context, p Page) error {
} }
// Execute the parsed templates to render the page // Execute the parsed templates to render the page
buf, err := t.executeTemplates(c, p) buf, err := t.executeTemplates(p)
if err != nil { if err != nil {
c.Logger().Errorf("failed to execute templates: %v", err) c.Logger().Errorf("failed to execute templates: %v", err)
return echo.NewHTTPError(http.StatusInternalServerError, "Internal server error") return echo.NewHTTPError(http.StatusInternalServerError, "Internal server error")
@ -164,7 +164,7 @@ func (t *Controller) parsePageTemplates(p Page) error {
} }
// executeTemplates executes the cached templates belonging to Page and renders the Page within them // executeTemplates executes the cached templates belonging to Page and renders the Page within them
func (t *Controller) executeTemplates(c echo.Context, p Page) (*bytes.Buffer, error) { func (t *Controller) executeTemplates(p Page) (*bytes.Buffer, error) {
tmpl, ok := templates.Load(p.Name) tmpl, ok := templates.Load(p.Name)
if !ok { if !ok {
return nil, errors.New("uncached page template requested") return nil, errors.New("uncached page template requested")

6
services/container.go
View file

@ -5,8 +5,6 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"goweb/mail"
"entgo.io/ent/dialect" "entgo.io/ent/dialect"
entsql "entgo.io/ent/dialect/sql" entsql "entgo.io/ent/dialect/sql"
"github.com/eko/gocache/v2/cache" "github.com/eko/gocache/v2/cache"
@ -27,7 +25,7 @@ type Container struct {
cacheClient *redis.Client cacheClient *redis.Client
Database *sql.DB Database *sql.DB
ORM *ent.Client ORM *ent.Client
Mail *mail.Client Mail *MailClient
Auth *AuthClient Auth *AuthClient
} }
@ -137,7 +135,7 @@ func (c *Container) initORM() {
func (c *Container) initMail() { func (c *Container) initMail() {
var err error var err error
c.Mail, err = mail.NewClient(c.Config) c.Mail, err = NewMailClient(c.Config)
if err != nil { if err != nil {
panic(fmt.Sprintf("failed to create mail client: %v", err)) panic(fmt.Sprintf("failed to create mail client: %v", err))
} }