Skip to content

Commit b63382a

Browse files
authored
Merge branch 'memphisdev:master' into master
2 parents 9911e71 + c73b9c0 commit b63382a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

conf/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"VERSION": "1.1.2",
2+
"VERSION": "1.1.3",
33
"JWT_EXPIRES_IN_MINUTES": 15,
44
"REFRESH_JWT_EXPIRES_IN_MINUTES": 300
55
}

main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010
)
1111

12-
func initalizeLogger() *logger.Logger {
12+
func initializeLogger() *logger.Logger {
1313
configuration := conf.GetConfig()
1414
ticker := time.NewTicker(1 * time.Second)
1515
for {
@@ -18,7 +18,7 @@ func initalizeLogger() *logger.Logger {
1818
creds := configuration.CONNECTION_TOKEN
1919
username := configuration.ROOT_USER
2020
if configuration.USER_PASS_BASED_AUTH {
21-
username = "$memphis"
21+
username = "$$memphis"
2222
creds = configuration.CONNECTION_TOKEN + "_" + configuration.ROOT_PASSWORD
2323
}
2424
l, err := logger.CreateLogger(configuration.MEMPHIS_HOST, username, creds)
@@ -34,7 +34,7 @@ func initalizeLogger() *logger.Logger {
3434

3535
func main() {
3636
configuration := conf.GetConfig()
37-
l := initalizeLogger()
37+
l := initializeLogger()
3838
go handlers.CleanConnectionsCache()
3939
app := router.SetupRoutes(l)
4040
l.Noticef("Memphis REST gateway is up and running")

version.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.2
1+
1.1.3

0 commit comments

Comments
 (0)