more mutex.lock, settings db to vars

Author: LbP22

application/backend/app/userdb/userdb.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/devforth/OnLogs/app/vars"
-	"github.com/syndtr/goleveldb/leveldb"
 )
 
 func IsUserExists(login string) bool {
@@ -70,19 +69,17 @@ func CheckUserPassword(login string, gotPassword string) bool {
 }
 
 func GetUserSettings(username string) map[string]interface{} {
-	settingsDB, _ := leveldb.OpenFile("leveldb/usersSettings", nil)
-	defer settingsDB.Close()
 	var to_return map[string]interface{}
-	result, _ := settingsDB.Get([]byte(username), nil)
+	vars.Mutex.Lock()
+	result, _ := vars.SettingsDB.Get([]byte(username), nil)
+	vars.Mutex.Unlock()
 	json.Unmarshal(result, &to_return)
 	return to_return
 }
 
 func UpdateUserSettings(username string, settings map[string]interface{}) {
-	settingsDB, _ := leveldb.OpenFile("leveldb/usersSettings", nil)
-	defer settingsDB.Close()
 	to_put, _ := json.Marshal(settings)
 	vars.Mutex.Lock()
-	settingsDB.Put([]byte(username), to_put, nil)
+	vars.SettingsDB.Put([]byte(username), to_put, nil)
 	vars.Mutex.Unlock()
 }

application/backend/app/vars/vars.go

@@ -31,10 +31,11 @@ var (
 	Mutex   sync.Mutex
 	DBMutex sync.RWMutex
 
-	FavsDB, FavsDBErr     = leveldb.OpenFile("leveldb/favourites", nil)
-	StateDB, StateDBErr   = leveldb.OpenFile("leveldb/state", nil)
-	UsersDB, UsersDBErr   = leveldb.OpenFile("leveldb/users", nil)
-	TokensDB, TokensDBErr = leveldb.OpenFile("leveldb/tokens", nil)
+	FavsDB, FavsDBErr         = leveldb.OpenFile("leveldb/favourites", nil)
+	StateDB, StateDBErr       = leveldb.OpenFile("leveldb/state", nil)
+	UsersDB, UsersDBErr       = leveldb.OpenFile("leveldb/users", nil)
+	TokensDB, TokensDBErr     = leveldb.OpenFile("leveldb/tokens", nil)
+	SettingsDB, SettingsDBErr = leveldb.OpenFile("leveldb/usersSettings", nil)
 
 	Year = strconv.Itoa(time.Now().UTC().Year())
 )

application/release.sh

@@ -1,4 +1,4 @@
 # docker buildx create --use
-docker buildx build --platform=linux/amd64,linux/arm64 --tag "devforth/onlogs:latest" --tag "devforth/onlogs:1.1.7" --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --tag "devforth/onlogs:latest" --tag "devforth/onlogs:1.1.8" --push .
 # docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -it $(docker build -q -f Dockerfile .)
 # docker build . -t devforth/onlogs && docker push devforth/onlogs