mirror of
https://github.com/strongdm/comply
synced 2024-11-24 16:44:53 +00:00
fix channel infinite wait (#100)
This commit is contained in:
parent
fb6d1c0bdd
commit
bc25dae339
@ -49,7 +49,7 @@ func renderToFilesystem(wg *sync.WaitGroup, errOutputCh chan error, data *render
|
|||||||
|
|
||||||
rel, err := filepath.Rel(config.ProjectRoot(), p.FullPath)
|
rel, err := filepath.Rel(config.ProjectRoot(), p.FullPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
rel = p.FullPath
|
rel = p.FullPat
|
||||||
}
|
}
|
||||||
fmt.Printf("%s -> %s\n", rel, filepath.Join("output", p.OutputFilename))
|
fmt.Printf("%s -> %s\n", rel, filepath.Join("output", p.OutputFilename))
|
||||||
}(doc)
|
}(doc)
|
||||||
|
@ -64,9 +64,11 @@ func dockerPandoc(outputFilename string, errOutputCh chan error) {
|
|||||||
errOutputCh <- errors.Wrap(err, "unable to remove container")
|
errOutputCh <- errors.Wrap(err, "unable to remove container")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
errOutputCh <-nil
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
|
err = cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
|
||||||
|
if err != nil {
|
||||||
errOutputCh <- errors.Wrap(err, "unable to start Docker container")
|
errOutputCh <- errors.Wrap(err, "unable to start Docker container")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -90,8 +92,6 @@ func dockerPandoc(outputFilename string, errOutputCh chan error) {
|
|||||||
errOutputCh <- errors.Wrap(err, "output not generated; verify your Docker image is up to date")
|
errOutputCh <- errors.Wrap(err, "output not generated; verify your Docker image is up to date")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
errOutputCh <- nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 🐼
|
// 🐼
|
||||||
|
@ -42,6 +42,12 @@ func pdf(output string, live bool, errCh chan error, wg *sync.WaitGroup) {
|
|||||||
|
|
||||||
for _, narrative := range narratives {
|
for _, narrative := range narratives {
|
||||||
renderToFilesystem(&pdfWG, errOutputCh, data, narrative, live)
|
renderToFilesystem(&pdfWG, errOutputCh, data, narrative, live)
|
||||||
|
err = <-errOutputCh
|
||||||
|
if err != nil {
|
||||||
|
errCh <- err
|
||||||
|
wg.Done()
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pdfWG.Wait()
|
pdfWG.Wait()
|
||||||
|
Loading…
Reference in New Issue
Block a user