cycore/web
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update db to normal pgsql

Browse source 
Signed-off-by: Seán C McCord <ulexus@gmail.com>
This commit is contained in:
Seán C McCord 2022-07-24 14:13:12 -04:00
parent 69ee137dd7
commit 22ba53150b
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
db/db.go
View file

@ -27,22 +27,24 @@ func Connect() error {
if err == nil {
username = u.Username
}
if os.Getenv("COCKROACH_USER") != "" {
username = os.Getenv("COCKROACH_USER")
password = os.Getenv("COCKROACH_PASS")
}
if os.Getenv("COCKROACH_HOST") != "" {
host = os.Getenv("COCKROACH_HOST")
if os.Getenv("DB_USER") != "" {
username = os.Getenv("DB_USER")
password = os.Getenv("DB_PASS")
}
if os.Getenv("DB_HOST") != "" {
host = os.Getenv("DB_HOST")
}
dsn := fmt.Sprintf("postgresql://%s@%s:26257/cycore?sslmode=disable", username, host)
if os.Getenv("KUBERNETES_SERVICE_HOST") != "" {
if host == "localhost" {
host = "cockroachdb-public.db.svc.cluster.local"
host = "db"
}
dsn = fmt.Sprintf("postgresql://%s:%s@%s:26257/cycore?sslmode=verify-full&sslrootcert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt&sslcert=/cockroach-certs/cert&sslkey=/cockroach-certs/key", username, password, host)
}
dsn := fmt.Sprintf("postgresql://%s:%s@%s:5432/cycore?sslmode=disable", username, password, host)
if os.Getenv("DSN") != "" {
dsn = os.Getenv("DSN")
}

2
dev.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
#go generate
go build
./cycore-web -debug

8
main.go
View file

@ -36,14 +36,6 @@ func main() {
flag.Parse()
log := log15.New("app", "cycore-web")
if os.Getenv("KUBERNETES_SERVICE_HOST") != "" {
h, err := log15.NetHandler("tcp", "oklog.log", log15.JsonFormat())
if err != nil {
log.Error("failed to construct network logger", "error", err)
} else {
log.SetHandler(h)
}
}
err := db.Connect()
if err != nil {