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

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

View File

@@ -9,7 +9,7 @@ import (
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
)
const chromeWarmupTime = 10 * time.Second
const chromeWarmupTime time.Duration = 10 * time.Second
type chrome struct {
manager *processManager
@@ -28,7 +28,7 @@ func (p *chrome) Fullname() string {
}
func (p *chrome) Start() error {
const op = "pm2.chrome.Start"
const op string = "pm2.chrome.Start"
if err := p.manager.start(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -36,7 +36,7 @@ func (p *chrome) Start() error {
}
func (p *chrome) Shutdown() error {
const op = "pm2.chrome.Shutdown"
const op string = "pm2.chrome.Shutdown"
if err := p.manager.shutdown(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -67,7 +67,7 @@ func (p *chrome) name() string {
}
func (p *chrome) viable() bool {
const op = "pm2.chrome.viable"
const op string = "pm2.chrome.viable"
// check if Google Chrome is correctly running.
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -93,7 +93,7 @@ func (p *chrome) viable() bool {
}
func (p *chrome) warmup() {
const op = "pm2.chrome.warmup"
const op string = "pm2.chrome.warmup"
p.manager.logger.DebugfOp(
op,
"allowing %v to startup",

View File

@@ -12,7 +12,7 @@ import (
)
const (
stoppedState = iota
stoppedState int32 = iota
runningState
errorState
)
@@ -35,7 +35,7 @@ type processManager struct {
}
func (m *processManager) start(p Process) error {
const op = "pm2.start"
const op string = "pm2.start"
if err := m.pm2(p, "start"); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -63,7 +63,7 @@ func (m *processManager) start(p Process) error {
}
func (m *processManager) shutdown(p Process) error {
const op = "pm2.shutdown"
const op string = "pm2.shutdown"
if m.heuristicState != runningState {
return nil
}
@@ -76,7 +76,7 @@ func (m *processManager) shutdown(p Process) error {
}
func (m *processManager) pm2(p Process, cmdName string) error {
const op = "pm2.pm2"
const op string = "pm2.pm2"
cmdArgs := []string{
cmdName,
p.name(),

View File

@@ -7,7 +7,7 @@ import (
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
)
const unoconvWarmupTime = 5 * time.Second
const unoconvWarmupTime time.Duration = 5 * time.Second
type unoconv struct {
manager *processManager
@@ -26,7 +26,7 @@ func (p *unoconv) Fullname() string {
}
func (p *unoconv) Start() error {
const op = "pm2.unoconv.Start"
const op string = "pm2.unoconv.Start"
if err := p.manager.start(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -34,7 +34,7 @@ func (p *unoconv) Start() error {
}
func (p *unoconv) Shutdown() error {
const op = "pm2.unoconv.Shutdown"
const op string = "pm2.unoconv.Shutdown"
if err := p.manager.shutdown(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -60,7 +60,7 @@ func (p *unoconv) viable() bool {
}
func (p *unoconv) warmup() {
const op = "pm2.unoconv.warmup"
const op string = "pm2.unoconv.warmup"
p.manager.logger.DebugfOp(
op,
"allowing %v to startup",