apairon/mark2web
1
1
Fork 0
Code Issues 8 Pull Requests Releases 5 Activity

improved logging
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Sebastian Frank
2019-03-29 15:49:25 +01:00
parent 7695f42e20
commit daed37587e
15 changed files with 142 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/filter/custom.go
View File

@@ -2,7 +2,6 @@ package filter
import (
"io/ioutil"
"os"
"path"
"strings"
@@ -34,8 +33,7 @@ func RegisterFilters(dir string) {
fn, err := vm.Run(jsFile)
logger.Eexit(err, "error in javascript vm for '%s'", jsFile)
if !fn.IsFunction() {
logger.E("%s does not contain a function code", jsFile)
os.Exit(1)
logger.Exit("%s does not contain a function code", jsFile)
}
err = pongo2.RegisterFilter(

21
pkg/filter/image_process.go
View File

@@ -131,7 +131,7 @@ func ImageProcessFilter(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *
pt := path.Dir(imgTarget)
if _, err := os.Stat(pt); os.IsNotExist(err) {
logger.Log.Infof("create image target dir: %s", pt)
logger.I("create image target dir: %s", pt)
if err := os.MkdirAll(pt, 0755); err != nil {
return nil, &pongo2.Error{
Sender: "filter:image_resize",
@@ -147,11 +147,11 @@ func ImageProcessFilter(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *
}
if f, err := os.Stat(imgTarget); err == nil && !f.IsDir() {
logger.Log.Noticef("skipped processing image from %s to %s, file already exists", imgSource, imgTarget)
logger.N("skipped processing image from %s to %s, file already exists", imgSource, imgTarget)
} else {
jobm.Enqueue(jobm.Job{
Function: func() {
logger.Log.Noticef("processing image from %s to %s", imgSource, imgTarget)
logger.N("processing image from %s to %s", imgSource, imgTarget)
if strings.HasPrefix(imgSource, "http://") || strings.HasPrefix(imgSource, "https://") {
// remote file
img, p.Format, err = webrequest.GetImage(imgSource)
@@ -189,11 +189,11 @@ func ImageProcessFilter(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *
case "bottomright":
anchor = imaging.BottomRight
default:
logger.Log.Panicf("filter:image_resize, unknown anchor a=%s definition", p.Anchor)
logger.Exit("filter:image_resize, unknown anchor a=%s definition", p.Anchor)
}
img = imaging.Fill(img, p.Width, p.Height, anchor, imaging.Lanczos)
default:
logger.Log.Panicf("filter:image_resize, invalid p parameter '%s'", p.Process)
logger.Exit("filter:image_resize, invalid p parameter '%s'", p.Process)
}
if p.Format == "" {
@@ -207,14 +207,13 @@ func ImageProcessFilter(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *
err = imaging.Save(img, imgTarget, encodeOptions...)
logger.Eerr(err, "filter:image_resize, could save image '%s'", imgTarget)
default:
logger.E("filter:image_resize, invalid filename extension for image: %s", imgTarget)
os.Exit(1)
logger.Exit("filter:image_resize, invalid filename extension for image: %s", imgTarget)
}
} else {
out, err := os.Create(imgTarget)
defer out.Close()
logger.Eerr(err, "filter:image_resize, could not create image file '%s'", imgTarget)
logger.Eexit(err, "filter:image_resize, could not create image file '%s'", imgTarget)
switch p.Format {
case "jpeg", "jpg":
var jpegOpt *jpeg.Options
@@ -229,12 +228,12 @@ func ImageProcessFilter(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *
case "gif":
err = gif.Encode(out, img, nil)
default:
logger.E("filter:image_resize, unknown format '%s' for '%s'", p.Format, imgSource)
logger.Exit("filter:image_resize, unknown format '%s' for '%s'", p.Format, imgSource)
}
logger.Eerr(err, "filter:image_resize, could not encode image file '%s'", imgTarget)
logger.Eexit(err, "filter:image_resize, could not encode image file '%s'", imgTarget)
}
logger.Log.Noticef("finished image: %s", imgTarget)
logger.N("finished image: %s", imgTarget)
},
Description: imgSource,
Category: "image process",