Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
chore(mod): update dependency
  • Loading branch information
knqyf263 committed Apr 15, 2020
commit 5cfdf5a694b4640f16e478eea2a688a72a956b0c
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ require (
github.com/kylelemons/godebug v1.1.0
github.com/olekukonko/tablewriter v0.0.2-0.20190607075207-195002e6e56a
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/spf13/afero v1.2.2
github.com/stretchr/testify v1.4.0
github.com/twitchtv/twirp v5.10.1+incompatible
github.com/urfave/cli v1.22.1
Expand Down
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/server/inject.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func initializeLibServer() *library.Server {
return &library.Server{}
}

func initializeDBWorker(quiet bool) dbWorker {
func initializeDBWorker(cacheDir string, quiet bool) dbWorker {
wire.Build(DBWorkerSuperSet)
return dbWorker{}
}
9 changes: 7 additions & 2 deletions pkg/rpc/server/listen.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func ListenAndServe(c config.Config, fsCache cache.FSCache) error {
}

go func() {
worker := initializeDBWorker(true)
worker := initializeDBWorker(c.CacheDir, true)
ctx := context.Background()
for {
time.Sleep(1 * time.Hour)
Expand Down Expand Up @@ -99,7 +99,8 @@ func newDBWorker(dbClient dbFile.Operation) dbWorker {

func (w dbWorker) update(ctx context.Context, appVersion, cacheDir string,
dbUpdateWg, requestWg *sync.WaitGroup) error {
needsUpdate, err := w.dbClient.NeedsUpdate(ctx, appVersion, false, false)
log.Logger.Debug("Check for DB update...")
needsUpdate, err := w.dbClient.NeedsUpdate(appVersion, false, false)
if err != nil {
return xerrors.Errorf("failed to check if db needs an update")
} else if !needsUpdate {
Expand Down Expand Up @@ -139,6 +140,10 @@ func (w dbWorker) hotUpdate(ctx context.Context, cacheDir string, dbUpdateWg, re
return xerrors.Errorf("failed to copy the database file: %w", err)
}

if err = w.dbClient.UpdateMetadata(cacheDir); err != nil {
return xerrors.Errorf("unable to update database metadata: %w", err)
}

log.Logger.Info("Reopening DB...")
if err = db.Init(cacheDir); err != nil {
return xerrors.Errorf("failed to open DB: %w", err)
Expand Down
5 changes: 3 additions & 2 deletions pkg/rpc/server/listen_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,11 @@ func Test_dbWorker_update(t *testing.T) {

require.NoError(t, db.Init(cacheDir), tt.name)

mockDBClient := new(dbFile.MockClient)
mockDBClient.On("NeedsUpdate", mock.Anything,
mockDBClient := new(dbFile.MockOperation)
mockDBClient.On("NeedsUpdate",
tt.needsUpdate.input.appVersion, false, tt.needsUpdate.input.skip).Return(
tt.needsUpdate.output.needsUpdate, tt.needsUpdate.output.err)
mockDBClient.On("UpdateMetadata", mock.Anything).Return(nil)

if tt.download.call {
mockDBClient.On("Download", mock.Anything, mock.Anything, false).Run(
Expand Down
7 changes: 5 additions & 2 deletions pkg/rpc/server/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.