mirror of
https://github.com/joohoi/acme-dns.git
synced 2025-07-10 07:47:34 +07:00
Fix mutex embedding lint issue
This commit is contained in:
20
db.go
20
db.go
@ -55,8 +55,8 @@ func getSQLiteStmt(s string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *acmedb) Init(engine string, connection string) error {
|
func (d *acmedb) Init(engine string, connection string) error {
|
||||||
d.Lock()
|
d.Mutex.Lock()
|
||||||
defer d.Unlock()
|
defer d.Mutex.Unlock()
|
||||||
db, err := sql.Open(engine, connection)
|
db, err := sql.Open(engine, connection)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -171,8 +171,8 @@ func (d *acmedb) NewTXTValuesInTransaction(tx *sql.Tx, subdomain string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *acmedb) Register(afrom cidrslice) (ACMETxt, error) {
|
func (d *acmedb) Register(afrom cidrslice) (ACMETxt, error) {
|
||||||
d.Lock()
|
d.Mutex.Lock()
|
||||||
defer d.Unlock()
|
defer d.Mutex.Unlock()
|
||||||
var err error
|
var err error
|
||||||
tx, err := d.DB.Begin()
|
tx, err := d.DB.Begin()
|
||||||
// Rollback if errored, commit if not
|
// Rollback if errored, commit if not
|
||||||
@ -210,8 +210,8 @@ func (d *acmedb) Register(afrom cidrslice) (ACMETxt, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *acmedb) GetByUsername(u uuid.UUID) (ACMETxt, error) {
|
func (d *acmedb) GetByUsername(u uuid.UUID) (ACMETxt, error) {
|
||||||
d.Lock()
|
d.Mutex.Lock()
|
||||||
defer d.Unlock()
|
defer d.Mutex.Unlock()
|
||||||
var results []ACMETxt
|
var results []ACMETxt
|
||||||
getSQL := `
|
getSQL := `
|
||||||
SELECT Username, Password, Subdomain, AllowFrom
|
SELECT Username, Password, Subdomain, AllowFrom
|
||||||
@ -248,8 +248,8 @@ func (d *acmedb) GetByUsername(u uuid.UUID) (ACMETxt, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) {
|
func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) {
|
||||||
d.Lock()
|
d.Mutex.Lock()
|
||||||
defer d.Unlock()
|
defer d.Mutex.Unlock()
|
||||||
domain = sanitizeString(domain)
|
domain = sanitizeString(domain)
|
||||||
var txts []string
|
var txts []string
|
||||||
getSQL := `
|
getSQL := `
|
||||||
@ -282,8 +282,8 @@ func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *acmedb) Update(a ACMETxtPost) error {
|
func (d *acmedb) Update(a ACMETxtPost) error {
|
||||||
d.Lock()
|
d.Mutex.Lock()
|
||||||
defer d.Unlock()
|
defer d.Mutex.Unlock()
|
||||||
var err error
|
var err error
|
||||||
// Data in a is already sanitized
|
// Data in a is already sanitized
|
||||||
timenow := time.Now().Unix()
|
timenow := time.Now().Unix()
|
||||||
|
4
types.go
4
types.go
@ -63,7 +63,7 @@ type logconfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type acmedb struct {
|
type acmedb struct {
|
||||||
sync.Mutex
|
Mutex sync.Mutex
|
||||||
DB *sql.DB
|
DB *sql.DB
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,6 +76,4 @@ type database interface {
|
|||||||
GetBackend() *sql.DB
|
GetBackend() *sql.DB
|
||||||
SetBackend(*sql.DB)
|
SetBackend(*sql.DB)
|
||||||
Close()
|
Close()
|
||||||
Lock()
|
|
||||||
Unlock()
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user