Skip to content

Refactor code to remove old dependency #84

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

Merged
merged 1 commit into from
Jan 17, 2022
Merged

Refactor code to remove old dependency #84

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.16
require (
github.com/arduino/arduino-cli v0.0.0-20210520100059-2666b6ec51e9
github.com/arduino/go-paths-helper v1.6.1
github.com/arduino/golang-concurrent-workers v0.0.0-20170202182617-6710cdc954bc
github.com/go-git/go-git/v5 v5.4.2
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4l
github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b/go.mod h1:uwGy5PpN4lqW97FiLnbcx+xx8jly5YuPMJWfVwwjJiQ=
github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b h1:3PjgYG5gVPA7cipp7vIR2lF96KkEJIFBJ+ANnuv6J20=
github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b/go.mod h1:iIPnclBMYm1g32Q5kXoqng4jLhMStReIP7ZxaoUC2y8=
github.com/arduino/golang-concurrent-workers v0.0.0-20170202182617-6710cdc954bc h1:PzGY1Ppud/Ng+LFHU16oOrWhYsnSLYurwiHlbVc/FJ0=
github.com/arduino/golang-concurrent-workers v0.0.0-20170202182617-6710cdc954bc/go.mod h1:E+WBbLkFBdPp+N+yijgbdDI33mr5pm6j42RYLN5K4do=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
Expand Down
69 changes: 28 additions & 41 deletions internal/command/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ import (
"log"
"os"
"path/filepath"
"runtime"
"sync"

cc "github.com/arduino/golang-concurrent-workers"
"github.com/arduino/libraries-repository-engine/internal/configuration"
"github.com/arduino/libraries-repository-engine/internal/feedback"
"github.com/arduino/libraries-repository-engine/internal/libraries"
Expand Down Expand Up @@ -79,54 +80,40 @@ func syncLibraries(reposFile string) {
os.Exit(1)
}

type jobContext struct {
id int
repoMetadata *libraries.Repo
}

libraryDb := db.Init(config.LibrariesDB)

jobQueue := make(chan *jobContext)

pool := cc.New(4)
worker := func() {
log.Println("Started worker...")
for job := range jobQueue {
buffer := &bytes.Buffer{}
logger := log.New(buffer, "", log.LstdFlags|log.LUTC)
syncLibrary(logger, job.repoMetadata, libraryDb)

// Output log to file
if err := outputLogFile(logger, job.repoMetadata, buffer); err != nil {
logger.Printf("Error writing log file: %s", err.Error())
}

// Output log to stdout
fmt.Println(buffer.String())
}
log.Println("Completed worker!")
}
pool.Run(worker)
pool.Run(worker)
pool.Run(worker)
pool.Run(worker)
pool.Wait()

reposChan := make(chan *libraries.Repo)
go func() {
id := 0
for _, repo := range repos {
jobQueue <- &jobContext{
id: id,
repoMetadata: repo,
}
id++
reposChan <- repo
}
close(jobQueue)
close(reposChan)
}()

for err := range pool.Errors {
feedback.LogError(err)
// Run workers in parallel to consume repositories list
var wg sync.WaitGroup
for workersCount := 0; workersCount < runtime.NumCPU(); workersCount++ {
wg.Add(1)
go func() {
log.Println("Started worker...")
for repo := range reposChan {
buffer := &bytes.Buffer{}
logger := log.New(buffer, "", log.LstdFlags|log.LUTC)
syncLibrary(logger, repo, libraryDb)

// Output log to file
if err := outputLogFile(logger, repo, buffer); err != nil {
logger.Printf("Error writing log file: %s", err.Error())
}

// Output log to stdout
fmt.Println(buffer.String())
}
wg.Done()
log.Println("Completed worker!")
}()
}
wg.Wait()

libraryIndex, err := libraryDb.OutputLibraryIndex()
if feedback.LogError(err) {
Expand Down