TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-07 02:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
GoEdgeLab
2023-07-28 11:10:57 +08:00
parent 02dfb9afcf
commit 079955b93e
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/utils/dbs/db.go
View File

@@ -10,7 +10,7 @@ import (
teaconst "github.com/TeaOSLab/EdgeNode/internal/const" teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
"github.com/TeaOSLab/EdgeNode/internal/events" "github.com/TeaOSLab/EdgeNode/internal/events"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/remotelogs"
"github.com/TeaOSLab/EdgeNode/internal/utils/fileutils" "github.com/TeaOSLab/EdgeNode/internal/utils/fs"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"net/url" "net/url"
"strings" "strings"
@@ -21,7 +21,7 @@ import (
var errDBIsClosed = errors.New("the database is closed") var errDBIsClosed = errors.New("the database is closed")
type DB struct { type DB struct {
locker *fileutils.Locker locker *fsutils.Locker
rawDB *sql.DB rawDB *sql.DB
dsn string dsn string
@@ -49,7 +49,7 @@ func open(dsn string, lock bool) (*DB, error) {
} }
// locker // locker
var locker *fileutils.Locker var locker *fsutils.Locker
if lock { if lock {
var path = dsn var path = dsn
var queryIndex = strings.Index(dsn, "?") var queryIndex = strings.Index(dsn, "?")
@@ -57,7 +57,7 @@ func open(dsn string, lock bool) (*DB, error) {
path = path[:queryIndex] path = path[:queryIndex]
} }
path = strings.TrimSpace(strings.TrimPrefix(path, "file:")) path = strings.TrimSpace(strings.TrimPrefix(path, "file:"))
locker = fileutils.NewLocker(path) locker = fsutils.NewLocker(path)
err := locker.Lock() err := locker.Lock()
if err != nil { if err != nil {
remotelogs.Warn("DB", "lock '"+path+"' failed: "+err.Error()) remotelogs.Warn("DB", "lock '"+path+"' failed: "+err.Error())

2
internal/utils/fileutils/locker.go → internal/utils/fs/locker.go
View File

@@ -1,6 +1,6 @@
// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . // Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
package fileutils package fsutils
import ( import (
"os" "os"

8
internal/utils/fileutils/locker_test.go → internal/utils/fs/locker_test.go
View File

@@ -1,22 +1,22 @@
// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . // Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
package fileutils_test package fsutils_test
import ( import (
"github.com/TeaOSLab/EdgeNode/internal/utils/fileutils" "github.com/TeaOSLab/EdgeNode/internal/utils/fs"
"testing" "testing"
) )
func TestLocker_Lock(t *testing.T) { func TestLocker_Lock(t *testing.T) {
var path = "/tmp/file-test" var path = "/tmp/file-test"
var locker = fileutils.NewLocker(path) var locker = fsutils.NewLocker(path)
err := locker.Lock() err := locker.Lock()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_ = locker.Release() _ = locker.Release()
var locker2 = fileutils.NewLocker(path) var locker2 = fsutils.NewLocker(path)
err = locker2.Lock() err = locker2.Lock()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)