Skip to content

Commit

Permalink
NOISSUE - Fix default db name for storage databases (#1194)
Browse files Browse the repository at this point in the history
* Fix db name in influxdb

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Align db name and namespace from .env with default values  in mongodb and cassandra also

Signed-off-by: Ivan Milošević <iva@blokovi.com>

* Rename databases' names to mainflux

Signed-off-by: Ivan Milošević <iva@blokovi.com>

Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
  • Loading branch information
blokovi and drasko authored Jun 3, 2020
1 parent b060831 commit b3f5f0a
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ MF_POSTGRES_WRITER_PORT=9104
MF_POSTGRES_WRITER_DB_PORT=5432
MF_POSTGRES_WRITER_DB_USER=mainflux
MF_POSTGRES_WRITER_DB_PASS=mainflux
MF_POSTGRES_WRITER_DB=messages
MF_POSTGRES_WRITER_DB=mainflux
MF_POSTGRES_WRITER_DB_SSL_MODE=disable
MF_POSTGRES_WRITER_DB_SSL_CERT=""
MF_POSTGRES_WRITER_DB_SSL_KEY=""
Expand All @@ -220,7 +220,7 @@ MF_POSTGRES_READER_CA_CERTS=""
MF_POSTGRES_READER_DB_PORT=5432
MF_POSTGRES_READER_DB_USER=mainflux
MF_POSTGRES_READER_DB_PASS=mainflux
MF_POSTGRES_READER_DB=messages
MF_POSTGRES_READER_DB=mainflux
MF_POSTGRES_READER_DB_SSL_MODE=disable
MF_POSTGRES_READER_DB_SSL_CERT=""
MF_POSTGRES_READER_DB_SSL_KEY=""
Expand Down
2 changes: 1 addition & 1 deletion cmd/cassandra-reader/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
defLogLevel = "error"
defPort = "8180"
defCluster = "127.0.0.1"
defKeyspace = "messages"
defKeyspace = "mainflux"
defDBUser = "mainflux"
defDBPass = "mainflux"
defDBPort = "9042"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cassandra-writer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const (
defLogLevel = "error"
defPort = "8180"
defCluster = "127.0.0.1"
defKeyspace = "messages"
defKeyspace = "mainflux"
defDBUser = "mainflux"
defDBPass = "mainflux"
defDBPort = "9042"
Expand Down
2 changes: 1 addition & 1 deletion cmd/influxdb-reader/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
const (
defLogLevel = "error"
defPort = "8180"
defDB = "messages"
defDB = "mainflux"
defDBHost = "localhost"
defDBPort = "8086"
defDBUser = "mainflux"
Expand Down
2 changes: 1 addition & 1 deletion cmd/influxdb-writer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const (
defNatsURL = "nats://localhost:4222"
defLogLevel = "error"
defPort = "8180"
defDB = "messages"
defDB = "mainflux"
defDBHost = "localhost"
defDBPort = "8086"
defDBUser = "mainflux"
Expand Down
2 changes: 1 addition & 1 deletion cmd/mongodb-reader/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
const (
defLogLevel = "error"
defPort = "8180"
defDB = "messages"
defDB = "mainflux"
defDBHost = "localhost"
defDBPort = "27017"
defClientTLS = "false"
Expand Down
2 changes: 1 addition & 1 deletion cmd/mongodb-writer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
defLogLevel = "error"
defNatsURL = "nats://localhost:4222"
defPort = "8180"
defDB = "messages"
defDB = "mainflux"
defDBHost = "localhost"
defDBPort = "27017"
defSubjectsCfgPath = "/config/subjects.toml"
Expand Down
2 changes: 1 addition & 1 deletion cmd/postgres-reader/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const (
defDBPort = "5432"
defDBUser = "mainflux"
defDBPass = "mainflux"
defDB = "messages"
defDB = "mainflux"
defDBSSLMode = "disable"
defDBSSLCert = ""
defDBSSLKey = ""
Expand Down
2 changes: 1 addition & 1 deletion cmd/postgres-writer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const (
defDBPort = "5432"
defDBUser = "mainflux"
defDBPass = "mainflux"
defDB = "messages"
defDB = "mainflux"
defDBSSLMode = "disable"
defDBSSLCert = ""
defDBSSLKey = ""
Expand Down

0 comments on commit b3f5f0a

Please sign in to comment.