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

fixes waitTimeout, waitDelay not working with float

Browse Source
This commit is contained in:
Julien Neuhart
2019-07-08 17:24:17 +02:00
parent 186c09f29b
commit 9af00d6d58
11 changed files with 110 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/pkg/printer/chrome.go
View File

@@ -13,6 +13,7 @@ import (
"github.com/mafredri/cdp/protocol/target"
"github.com/mafredri/cdp/rpcc"
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
"github.com/thecodingmachine/gotenberg/internal/pkg/timeout"
"golang.org/x/sync/errgroup"
)
@@ -39,9 +40,7 @@ type ChromeOptions struct {
func (p *chrome) Print(destination string) error {
const op = "printer.chrome.Print"
// FIXME duration not working with float
duration := time.Duration(p.opts.WaitTimeout+p.opts.WaitDelay) * time.Second
ctx, cancel := context.WithTimeout(context.Background(), duration)
ctx, cancel := timeout.Context(p.opts.WaitTimeout + p.opts.WaitDelay)
defer cancel()
devt, err := devtool.New("http://localhost:9222").Version(ctx)
if err != nil {
@@ -153,8 +152,7 @@ func (p *chrome) navigate(ctx context.Context, client *cdp.Client) error {
return &standarderror.Error{Op: op, Err: err}
}
// wait for a given amount of time (useful for javascript delay).
// FIXME duration not working with float
time.Sleep(time.Duration(p.opts.WaitDelay) * time.Second)
time.Sleep(timeout.Duration(p.opts.WaitDelay))
return nil
}

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

@@ -3,9 +3,9 @@ package printer
import (
"context"
"os/exec"
"time"
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
"github.com/thecodingmachine/gotenberg/internal/pkg/timeout"
)
type merge struct {
@@ -31,8 +31,7 @@ func NewMerge(fpaths []string, opts *MergeOptions) Printer {
func (p *merge) Print(destination string) error {
const op = "printer.merge.Print"
if p.ctx == nil {
// FIXME duration not working with float
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(p.opts.WaitTimeout)*time.Second)
ctx, cancel := timeout.Context(p.opts.WaitTimeout)
defer cancel()
p.ctx = ctx
}

5
internal/pkg/printer/office.go
View File

@@ -7,10 +7,10 @@ import (
"os/exec"
"path/filepath"
"sync"
"time"
"github.com/labstack/gommon/random"
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
"github.com/thecodingmachine/gotenberg/internal/pkg/timeout"
)
type office struct {
@@ -35,8 +35,7 @@ func NewOffice(fpaths []string, opts *OfficeOptions) Printer {
func (p *office) Print(destination string) error {
const op = "printer.office.Print"
// FIXME duration not working with float
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(p.opts.WaitTimeout)*time.Second)
ctx, cancel := timeout.Context(p.opts.WaitTimeout)
defer cancel()
fpaths := make([]string, len(p.fpaths))
dirPath := filepath.Dir(destination)