Skip to content

Commit ecf258f

Browse files
committed
Use gorm connection pool
1 parent d4b27fd commit ecf258f

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

acls.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,8 @@ func (h *Headscale) expandAlias(s string) (*[]string, error) {
166166

167167
// This will have HORRIBLE performance.
168168
// We need to change the data model to better store tags
169-
db, err := h.db()
170-
if err != nil {
171-
log.Printf("Cannot open DB: %s", err)
172-
return nil, err
173-
}
174169
machines := []Machine{}
175-
if err = db.Where("registered").Find(&machines).Error; err != nil {
170+
if err := h.db.Where("registered").Find(&machines).Error; err != nil {
176171
return nil, err
177172
}
178173
ips := []string{}

acls_test.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ func (s *Suite) TestPortNamespace(c *check.C) {
8686
pak, err := h.CreatePreAuthKey(n.Name, false, false, nil)
8787
c.Assert(err, check.IsNil)
8888

89-
db, err := h.db()
90-
if err != nil {
91-
c.Fatal(err)
92-
}
93-
9489
_, err = h.GetMachine("testnamespace", "testmachine")
9590
c.Assert(err, check.NotNil)
9691
ip, _ := h.getAvailableIP()
@@ -106,7 +101,7 @@ func (s *Suite) TestPortNamespace(c *check.C) {
106101
IPAddress: ip.String(),
107102
AuthKeyID: uint(pak.ID),
108103
}
109-
db.Save(&m)
104+
h.db.Save(&m)
110105

111106
err = h.LoadACLPolicy("./tests/acls/acl_policy_basic_namespace_as_user.hujson")
112107
c.Assert(err, check.IsNil)
@@ -131,11 +126,6 @@ func (s *Suite) TestPortGroup(c *check.C) {
131126
pak, err := h.CreatePreAuthKey(n.Name, false, false, nil)
132127
c.Assert(err, check.IsNil)
133128

134-
db, err := h.db()
135-
if err != nil {
136-
c.Fatal(err)
137-
}
138-
139129
_, err = h.GetMachine("testnamespace", "testmachine")
140130
c.Assert(err, check.NotNil)
141131
ip, _ := h.getAvailableIP()
@@ -151,7 +141,7 @@ func (s *Suite) TestPortGroup(c *check.C) {
151141
IPAddress: ip.String(),
152142
AuthKeyID: uint(pak.ID),
153143
}
154-
db.Save(&m)
144+
h.db.Save(&m)
155145

156146
err = h.LoadACLPolicy("./tests/acls/acl_policy_basic_groups.hujson")
157147
c.Assert(err, check.IsNil)

0 commit comments

Comments
 (0)