Commit 3681a57a authored by Eric Chiang's avatar Eric Chiang Committed by GitHub

Merge pull request #587 from ericchiang/dev-sql-enable-gc

storage/sql: enable garbage collection
parents ea3a4293 ea4f3fd3
......@@ -5,6 +5,7 @@ import (
"fmt"
"net/url"
"strconv"
"time"
"github.com/coreos/dex/storage"
)
......@@ -17,7 +18,11 @@ type SQLite3 struct {
// Open creates a new storage implementation backed by SQLite3
func (s *SQLite3) Open() (storage.Storage, error) {
return s.open()
conn, err := s.open()
if err != nil {
return nil, err
}
return withGC(conn, time.Now), nil
}
func (s *SQLite3) open() (*conn, error) {
......@@ -67,7 +72,11 @@ type Postgres struct {
// Open creates a new storage implementation backed by Postgres.
func (p *Postgres) Open() (storage.Storage, error) {
return p.open()
conn, err := p.open()
if err != nil {
return nil, err
}
return withGC(conn, time.Now), nil
}
func (p *Postgres) open() (*conn, error) {
......
package sql
import (
"context"
"fmt"
"log"
"time"
"github.com/coreos/dex/storage"
)
type gc struct {
......@@ -10,10 +14,8 @@ type gc struct {
conn *conn
}
var tablesWithGC = []string{"auth_request", "auth_code"}
func (gc gc) run() error {
for _, table := range tablesWithGC {
for _, table := range []string{"auth_request", "auth_code"} {
_, err := gc.conn.Exec(`delete from `+table+` where expiry < $1`, gc.now())
if err != nil {
return fmt.Errorf("gc %s: %v", table, err)
......@@ -22,3 +24,30 @@ func (gc gc) run() error {
}
return nil
}
type withCancel struct {
storage.Storage
cancel context.CancelFunc
}
func (w withCancel) Close() error {
w.cancel()
return w.Storage.Close()
}
func withGC(conn *conn, now func() time.Time) storage.Storage {
ctx, cancel := context.WithCancel(context.Background())
run := (gc{now, conn}).run
go func() {
for {
select {
case <-time.After(time.Second * 30):
if err := run(); err != nil {
log.Printf("gc failed: %v", err)
}
case <-ctx.Done():
}
}
}()
return withCancel{conn, cancel}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment