diff --git a/internal/utils/dbs/db.go b/internal/utils/dbs/db.go index bb6d0ed..3736a07 100644 --- a/internal/utils/dbs/db.go +++ b/internal/utils/dbs/db.go @@ -10,7 +10,7 @@ import ( teaconst "github.com/TeaOSLab/EdgeNode/internal/const" "github.com/TeaOSLab/EdgeNode/internal/events" "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" "net/url" "strings" @@ -21,7 +21,7 @@ import ( var errDBIsClosed = errors.New("the database is closed") type DB struct { - locker *fileutils.Locker + locker *fsutils.Locker rawDB *sql.DB dsn string @@ -49,7 +49,7 @@ func open(dsn string, lock bool) (*DB, error) { } // locker - var locker *fileutils.Locker + var locker *fsutils.Locker if lock { var path = dsn var queryIndex = strings.Index(dsn, "?") @@ -57,7 +57,7 @@ func open(dsn string, lock bool) (*DB, error) { path = path[:queryIndex] } path = strings.TrimSpace(strings.TrimPrefix(path, "file:")) - locker = fileutils.NewLocker(path) + locker = fsutils.NewLocker(path) err := locker.Lock() if err != nil { remotelogs.Warn("DB", "lock '"+path+"' failed: "+err.Error()) diff --git a/internal/utils/fileutils/locker.go b/internal/utils/fs/locker.go similarity index 98% rename from internal/utils/fileutils/locker.go rename to internal/utils/fs/locker.go index e48b5a1..ae00f8c 100644 --- a/internal/utils/fileutils/locker.go +++ b/internal/utils/fs/locker.go @@ -1,6 +1,6 @@ // Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . -package fileutils +package fsutils import ( "os" diff --git a/internal/utils/fileutils/locker_test.go b/internal/utils/fs/locker_test.go similarity index 67% rename from internal/utils/fileutils/locker_test.go rename to internal/utils/fs/locker_test.go index d6b98d3..0af2a9b 100644 --- a/internal/utils/fileutils/locker_test.go +++ b/internal/utils/fs/locker_test.go @@ -1,22 +1,22 @@ // Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn . -package fileutils_test +package fsutils_test import ( - "github.com/TeaOSLab/EdgeNode/internal/utils/fileutils" + "github.com/TeaOSLab/EdgeNode/internal/utils/fs" "testing" ) func TestLocker_Lock(t *testing.T) { var path = "/tmp/file-test" - var locker = fileutils.NewLocker(path) + var locker = fsutils.NewLocker(path) err := locker.Lock() if err != nil { t.Fatal(err) } _ = locker.Release() - var locker2 = fileutils.NewLocker(path) + var locker2 = fsutils.NewLocker(path) err = locker2.Lock() if err != nil { t.Fatal(err)