Created dev env and implement db lookup for prefixes
This commit is contained in:
parent
dd0f9cba57
commit
2f6d45d4ef
@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"djpianalto.com/goff/djpianalto.com/goff/events"
|
||||
"djpianalto.com/goff/djpianalto.com/goff/exts"
|
||||
@ -101,8 +102,24 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
func getPrefixes(guild_id string) []string {
|
||||
func getPrefixes(guildID string) []string {
|
||||
queryString := "Select prefix from prefixes p, x_guilds_prefixes xgp where xgp.guild_id = $1 and xgp.prefix_id = p.id"
|
||||
rows, err := utils.Database.Query(queryString, guildID)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return []string{"Go.", "go."}
|
||||
}
|
||||
var prefixes []string
|
||||
for rows.Next() {
|
||||
var prefix string
|
||||
err = rows.Scan(&prefix)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
return []string{"Go.", "go."}
|
||||
}
|
||||
prefixes = append(prefixes, prefix)
|
||||
}
|
||||
return prefixes
|
||||
}
|
||||
|
||||
func ErrorHandler(ErrorChan chan disgoman.CommandError) {
|
||||
|
||||
@ -3,6 +3,7 @@ package utils
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
)
|
||||
|
||||
@ -84,7 +85,8 @@ func InitializeDatabase() {
|
||||
"user_id varchar(30) not null," +
|
||||
"creation_time timestamp not null default NOW()," +
|
||||
"trigger_time timestamp not null," +
|
||||
"completed bool not null default false)")
|
||||
"completed bool not null default false," +
|
||||
"processing bool default false)")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
@ -103,7 +105,7 @@ func LoadTestData() {
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
_, err = Database.Query("INSERT INTO prefixes (prefix) VALUES ('Go.'), ('go.'), ('go,')")
|
||||
_, err = Database.Query("INSERT INTO prefixes (prefix) VALUES ('Godev.'), ('godev.'), ('godev,')")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
|
||||
32
docker-dev.yml
Normal file
32
docker-dev.yml
Normal file
@ -0,0 +1,32 @@
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
# goff-db:
|
||||
# image: postgres
|
||||
# ports:
|
||||
# - "5432:5432"
|
||||
# volumes:
|
||||
# - "${PWD}/postgres.conf:/etc/postgresql/postgresql.conf"
|
||||
# - "goff-db:/var/lib/postgresql/data:rw"
|
||||
# env_file: ${PWD}/.env
|
||||
|
||||
goff:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: "${PWD}/Dockerfile"
|
||||
env_file: ${PWD}/.env
|
||||
# logging:
|
||||
# driver: awslogs
|
||||
# options:
|
||||
# awslogs-region: us-east-1
|
||||
# awslogs-group: "/docker/goff/production"
|
||||
# depends_on:
|
||||
# - goff-db
|
||||
environment:
|
||||
- DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?sslmode=disable
|
||||
# links:
|
||||
# - goff-db:goff.db
|
||||
|
||||
#volumes:
|
||||
# goff-db:
|
||||
# external: true
|
||||
Loading…
x
Reference in New Issue
Block a user