Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: debug reload memory leak #27

Merged
merged 1 commit into from
Nov 13, 2023
Merged

fix: debug reload memory leak #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 41 additions & 32 deletions offline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"errors"
"fmt"
"io"
"log"
"net/http"
"os"
"strconv"
Expand Down Expand Up @@ -53,14 +52,17 @@ var (
bufferPool = &sync.Pool{New: func() interface{} {
return make([]byte, 8<<10)
}}

logger *zap.Logger
)

type (
// An OfflineDatabase is a client for querying Pwned Passwords locally.
OfflineDatabase struct {
file *DatabaseFile
logger zap.Logger
cron *cron.Cron
file *DatabaseFile
cron *cron.Cron
dbFile string
updatedDbFile string
}

DatabaseFile struct {
Expand Down Expand Up @@ -104,7 +106,7 @@ func NewOfflineDatabase(dbFile string, updatedDbFile string) (*OfflineDatabase,
"pid": os.Getpid(),
},
}
logger := *zap.Must(config.Build())
logger = zap.Must(config.Build())
for {
if _, err := os.Stat(LockFileName); err == nil {
lockExists = true
Expand Down Expand Up @@ -139,41 +141,49 @@ func NewOfflineDatabase(dbFile string, updatedDbFile string) (*OfflineDatabase,
logger.Info("Database opened")
c := cron.New()
odb := &OfflineDatabase{
file: &DatabaseFile{db},
logger: logger,
cron: c,
file: &DatabaseFile{db},
cron: c,
dbFile: dbFile,
updatedDbFile: updatedDbFile,
}

c.AddFunc("@hourly", func() {
if _, err := os.Stat(updatedDbFile); err == nil {
lockExists := false
if _, err := os.Stat(LockFileName); err == nil {
lockExists = true
c.AddFunc("@hourly", odb.Reload)
c.Start()
return odb, nil

}

func (odb *OfflineDatabase) Reload() {
if _, err := os.Stat(odb.updatedDbFile); err == nil {
lockExists := false
if _, err := os.Stat(LockFileName); err == nil {
lockExists = true
}
if !lockExists {
logger.Sugar().Infof("Updating database %p from cron job", odb.file)
odb.file.Close()
if err := os.Rename(odb.updatedDbFile, odb.dbFile); err != nil {
logger.Error("error replacing updated database", zap.Error(err))
}
if !lockExists {
logger.Info("Updating database")
odb.file.database.Close()
if err := os.Rename(updatedDbFile, dbFile); err != nil {
log.Panic(err)
}
db, err := mmap.Open(dbFile)
if err != nil {
log.Panic(err)
}
odb.file = &DatabaseFile{db}
logger.Info("Database updated")
db, err := mmap.Open(odb.dbFile)
if err != nil {
logger.Error("error loading updated database", zap.Error(err))
}
odb.file = &DatabaseFile{db}
logger.Sugar().Infof("Database updated %p from cron job", odb.file)
}
})
c.Start()
return odb, nil
}
}

func (df *DatabaseFile) Close() error {
logger.Sugar().Infof("Closing database %p", df.database)
return df.database.Close()
}

// Close frees resources associated with the database.
func (od *OfflineDatabase) Close() error {
od.cron.Stop()
return od.file.database.Close()
return od.file.Close()
}

// Pwned checks how frequently the given hash is included in the Pwned Passwords
Expand Down Expand Up @@ -381,11 +391,10 @@ func (od *OfflineDatabase) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// not a hash, hash it now
hash = sha1.Sum([]byte(pw))
}
od.logger.Sugar().Infof("using database file at %p", od.file)
od.logger.Sugar().Infof("checking password: %s", hex.EncodeToString(hash[:]))
logger.Sugar().Infof("checking password: %s", hex.EncodeToString(hash[:]))
frequency, err := od.Pwned(hash)
if err != nil {
od.logger.Sugar().Warnf("error checking password: %v", err)
logger.Sugar().Warnf("error checking password: %v", err)
w.WriteHeader(http.StatusInternalServerError)
return
}
Expand Down