Reverting moving LockOSThread to main module.

This commit is contained in:
Stanislav Nikitin 2016-11-21 02:43:05 +05:00
parent 0392f510f5
commit 93d2bb7fc1
4 changed files with 17 additions and 1 deletions

View File

@ -40,7 +40,9 @@ func (c *Cache) deleteProfile(data map[string]string) {
_, ok1 := c.Profiles[data["profile_name"]]
if !ok1 {
fmt.Println("Profile deleted")
Database.Unlock()
Database.Db.MustExec(Database.Db.Rebind("DELETE FROM urt_profiles WHERE name=?"), data["profile_name"])
Database.Lock()
} else {
fmt.Println("Something goes wrong! Profile is still here!")
}
@ -75,6 +77,7 @@ func (c *Cache) FlushProfiles(data map[string]string) {
}
}
Database.Unlock()
tx := Database.Db.MustBegin()
fmt.Println("Adding new profiles...")
for _, profile := range new_profiles {
@ -85,6 +88,7 @@ func (c *Cache) FlushProfiles(data map[string]string) {
tx.NamedExec("UPDATE urt_profiles SET name=:name, version=:version, binary=:binary, second_x_session=:second_x_session, additional_parameters=:additional_parameters WHERE name=:name", &profile)
}
tx.Commit()
Database.Lock()
fmt.Println("Done")
}

View File

@ -85,6 +85,7 @@ func (c *Cache) FlushServers(data map[string]string) {
}
}
Database.Unlock()
tx := Database.Db.MustBegin()
fmt.Println("Adding new servers...")
if len(new_servers) > 0 {
@ -101,6 +102,7 @@ func (c *Cache) FlushServers(data map[string]string) {
}
tx.Commit()
Database.Lock()
fmt.Println("Done")
}

View File

@ -14,6 +14,7 @@ import (
//"database/sql"
"fmt"
"path"
"runtime"
"strconv"
// local
@ -48,10 +49,12 @@ func (d *Database) Close() {
tx.Commit()
d.Db.Close()
runtime.UnlockOSThread()
}
func (d *Database) Initialize(cfg *configuration.Config) {
fmt.Println("Initializing database...")
runtime.LockOSThread()
// Connect to database.
db_path := path.Join(cfg.TEMP["DATA"], "database.sqlite3")
@ -72,6 +75,10 @@ func (d *Database) Initialize(cfg *configuration.Config) {
}
}
func (d *Database) Lock() {
runtime.LockOSThread()
}
func (d *Database) Migrate() {
// Getting current database version.
dbver := 0
@ -87,3 +94,7 @@ func (d *Database) Migrate() {
migrate_full(d, dbver)
}
func (d *Database) Unlock() {
runtime.UnlockOSThread()
}

View File

@ -25,7 +25,6 @@ func main() {
numCPUs := runtime.NumCPU()
runtime.GOMAXPROCS(numCPUs)
runtime.LockOSThread()
ctx := context.New()
ctx.Initialize()