This commit is contained in:
Jacob Gunther
2023-02-14 22:39:54 -06:00
parent 72a17b128d
commit a2605a02a7
3 changed files with 18 additions and 13 deletions

View File

@@ -16,16 +16,18 @@ type RouteConfig struct {
MaxScale int `yaml:"max_scale"` MaxScale int `yaml:"max_scale"`
} }
type RedisConfig struct {
Host string `yaml:"host"`
Port uint16 `yaml:"port"`
User string `yaml:"user"`
Password string `yaml:"password"`
Database int `yaml:"database"`
}
type Configuration struct { type Configuration struct {
Host string `yaml:"host"` Host string `yaml:"host"`
Port uint16 `yaml:"port"` Port uint16 `yaml:"port"`
Redis struct { Redis RedisConfig `yaml:"redis"`
Host string `yaml:"host"`
Port uint16 `yaml:"port"`
User string `yaml:"user"`
Password string `yaml:"password"`
Database int `yaml:"database"`
} `yaml:"redis"`
Routes struct { Routes struct {
Face RouteConfig `yaml:"face"` Face RouteConfig `yaml:"face"`
Head RouteConfig `yaml:"head"` Head RouteConfig `yaml:"head"`

View File

@@ -33,7 +33,7 @@ func init() {
log.Fatal(err) log.Fatal(err)
} }
if err = r.Connect(config.Redis.URI, config.Redis.Database); err != nil { if err = r.Connect(config.Redis); err != nil {
log.Fatal(err) log.Fatal(err)
} }

View File

@@ -3,6 +3,7 @@ package main
import ( import (
"bytes" "bytes"
"context" "context"
"fmt"
"image" "image"
"image/draw" "image/draw"
"time" "time"
@@ -14,10 +15,12 @@ type Redis struct {
conn *redis.Client conn *redis.Client
} }
func (r *Redis) Connect(uri string, database int) error { func (r *Redis) Connect(conf RedisConfig) error {
c := redis.NewClient(&redis.Options{ c := redis.NewClient(&redis.Options{
Addr: uri, Addr: fmt.Sprintf("%s:%d", conf.Host, conf.Port),
DB: database, Username: conf.User,
Password: conf.Password,
DB: conf.Database,
}) })
r.conn = c r.conn = c