better op names + fixing issue with op chaining in errors

This commit is contained in:
Julien Neuhart
2019-07-08 10:28:43 +02:00
parent 5f6ab2fc08
commit 5af01505c2
11 changed files with 74 additions and 64 deletions

View File

@@ -103,7 +103,7 @@ func (c *Config) LogLevel() logrus.Level {
}
func defaultWaitTimeoutFromEnv(envVar string, defaultValue float64) (float64, error) {
const op = "defaultWaitTimeoutFromEnv"
const op = "config.defaultWaitTimeoutFromEnv"
if v, ok := os.LookupEnv(envVar); ok {
waitTimeout, err := strconv.ParseFloat(v, 64)
if err != nil {
@@ -119,7 +119,7 @@ func defaultWaitTimeoutFromEnv(envVar string, defaultValue float64) (float64, er
}
func defaultListenPortFromEnv(envVar string, defaultValue string) (string, error) {
const op = "defaultListenPortFromEnv"
const op = "config.defaultListenPortFromEnv"
if v, ok := os.LookupEnv(envVar); ok {
portAsUint, err := strconv.ParseUint(v, 10, 64)
if err != nil {
@@ -142,7 +142,7 @@ func defaultListenPortFromEnv(envVar string, defaultValue string) (string, error
}
func boolFromEnv(envVar string, defaultValue bool) (bool, error) {
const op = "boolFromEnv"
const op = "config.boolFromEnv"
if v, ok := os.LookupEnv(envVar); ok {
if v != "1" && v != "0" {
return defaultValue, &standarderror.Error{
@@ -157,7 +157,7 @@ func boolFromEnv(envVar string, defaultValue bool) (bool, error) {
}
func logLevelFromEnv(envVar string, defaultValue logrus.Level) (logrus.Level, error) {
const op = "logLevelFromEnv"
const op = "config.logLevelFromEnv"
if v, ok := os.LookupEnv(envVar); ok {
switch v {
case "DEBUG":

View File

@@ -28,7 +28,7 @@ func (p *chrome) Fullname() string {
}
func (p *chrome) Start() error {
const op = "chrome.Start"
const op = "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 = "chrome.Shutdown"
const op = "pm2.chrome.Shutdown"
if err := p.manager.shutdown(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -67,25 +67,25 @@ func (p *chrome) name() string {
}
func (p *chrome) viable() bool {
const debugOp = "chrome.viable"
const op = "pm2.chrome.viable"
// check if Google Chrome is correctly running.
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
p.manager.logger.DebugfOp(
debugOp,
op,
"checking liveness via debug version endpoint http://localhost:9222/json/version",
)
v, err := devtool.New("http://localhost:9222").Version(ctx)
if err != nil {
p.manager.logger.DebugfOp(
debugOp,
op,
"debug version endpoint returned error: %v",
err,
)
return false
}
p.manager.logger.DebugfOp(
debugOp,
op,
"debug version endpoint returned version info: %+v",
*v,
)
@@ -93,7 +93,7 @@ func (p *chrome) viable() bool {
}
func (p *chrome) warmup() {
const debugOp = "chrome.warmup"
const debugOp = "pm2.chrome.warmup"
p.manager.logger.DebugfOp(
debugOp,
"allowing %v to startup",

View File

@@ -22,7 +22,7 @@ func (p *unoconv) Fullname() string {
}
func (p *unoconv) Start() error {
const op = "unoconv.Start"
const op = "pm2.unoconv.Start"
if err := p.manager.start(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}
@@ -30,7 +30,7 @@ func (p *unoconv) Start() error {
}
func (p *unoconv) Shutdown() error {
const op = "unoconv.Shutdown"
const op = "pm2.unoconv.Shutdown"
if err := p.manager.shutdown(p); err != nil {
return &standarderror.Error{Op: op, Err: err}
}

View File

@@ -82,7 +82,6 @@ func Message(err error) string {
// Op returns the logical operation of the error, if available.
// Otherwise returns an empty string.
// FIXME: "resource.ChromePrinterOptions: float64: : "
func Op(err error) string {
if err == nil {
return ""
@@ -93,12 +92,10 @@ func Op(err error) string {
}
var buf bytes.Buffer
if e.Op != "" {
fmt.Fprintf(&buf, "%s: ", e.Op)
fmt.Fprintf(&buf, "%s", e.Op)
}
if e.Err != nil {
if wrappedOp := Op(e.Err); wrappedOp != "" {
fmt.Fprintf(&buf, "%s: ", wrappedOp)
}
if nestedOp := Op(e.Err); nestedOp != "" {
fmt.Fprintf(&buf, ": %s", nestedOp)
}
return buf.String()
}