diff --git a/db/db.go b/db/db.go index fecd5a9..f36d510 100644 --- a/db/db.go +++ b/db/db.go @@ -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") } diff --git a/dev.sh b/dev.sh index 8ddba4c..42e7c47 100755 --- a/dev.sh +++ b/dev.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh #go generate go build ./cycore-web -debug diff --git a/main.go b/main.go index 294006f..2529ff6 100644 --- a/main.go +++ b/main.go @@ -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 {