mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 03:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

go fmt && fix dataSources

Browse source 
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
This commit is contained in:
Maximilian Seifert 2019-03-27 23:02:07 +01:00
parent 7edf1a038a
commit e53c293a70
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clientapi/auth/storage/devices/storage_test.go
View file

@ -14,6 +14,7 @@ import (
var dataSource string var dataSource string
var insideCi = false var insideCi = false
var insideDocker = false var insideDocker = false
const dbName = "dendrite_device" const dbName = "dendrite_device"
func init() { func init() {
@ -32,12 +33,11 @@ func init() {
if insideCi { if insideCi {
dataSource = fmt.Sprintf("postgres://postgres@localhost/%s?sslmode=disable", dbName) dataSource = fmt.Sprintf("postgres://postgres@localhost/%s?sslmode=disable", dbName)
} else if insideDocker { } else if insideDocker {
dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost/%s?sslmode=disable", dbName) dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@postgres/%s?sslmode=disable", dbName)
} else { } else {
dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost:15432/%s?sslmode=disable", dbName) dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost:15432/%s?sslmode=disable", dbName)
} }
if insideCi { if insideCi {
database := "dendrite_device" database := "dendrite_device"
cmd := exec.Command("psql", database) cmd := exec.Command("psql", database)
@ -52,8 +52,6 @@ func init() {
} }
} }
type deviceSpec struct { type deviceSpec struct {
localPart string localPart string
devID string devID string

3
syncapi/storage/output_room_events_table_test.go
View file

@ -16,6 +16,7 @@ import (
var dataSource string var dataSource string
var insideCi = false var insideCi = false
var insideDocker = false var insideDocker = false
const dbName = "dendrite_syncapi" const dbName = "dendrite_syncapi"
func init() { func init() {
@ -34,7 +35,7 @@ func init() {
if insideCi { if insideCi {
dataSource = fmt.Sprintf("postgres://postgres@localhost/%s?sslmode=disable", dbName) dataSource = fmt.Sprintf("postgres://postgres@localhost/%s?sslmode=disable", dbName)
} else if insideDocker { } else if insideDocker {
dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost/%s?sslmode=disable", dbName) dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@postgres/%s?sslmode=disable", dbName)
} else { } else {
dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost:15432/%s?sslmode=disable", dbName) dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost:15432/%s?sslmode=disable", dbName)
} }