adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-16 04:12:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring of const + better timeout handling in pinter package + api package tests

Browse Source
This commit is contained in:
Julien Neuhart
2019-07-10 11:46:58 +02:00
parent 0c1e4e6888
commit f6b357691c
27 changed files with 604 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/pkg/printer/merge.go
View File

@@ -29,19 +29,25 @@ func NewMerge(fpaths []string, opts *MergeOptions) Printer {
}
func (p *merge) Print(destination string) error {
const op = "printer.merge.Print"
const op string = "printer.merge.Print"
if p.ctx == nil {
ctx, cancel := timeout.Context(p.opts.WaitTimeout)
defer cancel()
p.ctx = ctx
}
var cmdArgs []string
cmdArgs = append(cmdArgs, p.fpaths...)
cmdArgs = append(cmdArgs, "cat", "output", destination)
cmd := exec.CommandContext(p.ctx, "pdftk", cmdArgs...)
_, err := cmd.Output()
if err != nil {
return handleErrContext(p.ctx, &standarderror.Error{Op: op, Err: err})
resolver := func() error {
var cmdArgs []string
cmdArgs = append(cmdArgs, p.fpaths...)
cmdArgs = append(cmdArgs, "cat", "output", destination)
cmd := exec.CommandContext(p.ctx, "pdftk", cmdArgs...)
_, err := cmd.Output()
if err != nil {
return &standarderror.Error{Op: op, Err: err}
}
return nil
}
if err := resolver(); err != nil {
return timeout.Err(p.ctx, err)
}
return nil
}