Commit 8ed4f769 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Improve DB username and runtime module path handling.

parent fa3cfa51

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Reduce the frequency of socket checks on known active connections.

- Deleting a record from a leaderboard that does not exist now succeeds.

- Notification listings now use more accurate time in cacheable cursors.

- Use "root" as the default database user if not otherwise specified.



### Fixed

- Runtime module loading now correctly handles paths on non-UNIX environments.



## [2.0.2] - 2018-07-09

### Added

main.go

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) 
		parsedUrl.RawQuery = query.Encode()

	}



	if len(parsedUrl.User.Username()) < 1 {

		parsedUrl.User = url.User("root")

	}

	if len(parsedUrl.Path) < 1 {

		parsedUrl.Path = "/nakama"

	}

migrate/migrate.go

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ func Parse(args []string, logger *zap.Logger) { 
		parsedUrl.RawQuery = query.Encode()

	}



	if len(parsedUrl.User.Username()) < 1 {

		parsedUrl.User = url.User("root")

	}

	dbname := "nakama"

	if len(parsedUrl.Path) > 1 {

		dbname = parsedUrl.Path[1:]

server/runtime_module_cache.go

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ func LoadRuntimeModules(startupLogger *zap.Logger, config Config) (map[string]lu 


	// Override before Package library is invoked.

	lua.LuaLDir = runtimeConfig.Path

	lua.LuaPathDefault = lua.LuaLDir + "/?.lua;" + lua.LuaLDir + "/?/init.lua"

	lua.LuaPathDefault = lua.LuaLDir + string(os.PathSeparator) + "?.lua;" + lua.LuaLDir + string(os.PathSeparator) + "?" + string(os.PathSeparator) + "init.lua"

	os.Setenv(lua.LuaPath, lua.LuaPathDefault)



	startupLogger.Info("Initialising runtime", zap.String("path", lua.LuaLDir))
@@ -80,7 +80,7 @@ func LoadRuntimeModules(startupLogger *zap.Logger, config Config) (map[string]lu 
				relPath, _ := filepath.Rel(lua.LuaLDir, path)

				name := strings.TrimSuffix(relPath, filepath.Ext(relPath))

				// Make paths Lua friendly.

				name = strings.Replace(name, "/", ".", -1)

				name = strings.Replace(name, string(os.PathSeparator), ".", -1)

				moduleCache.Add(&RuntimeModule{

					Name:    name,

					Path:    path,