robocars/robocar-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(log): use zap logger

Browse Source
This commit is contained in:
Cyrille Nofficial 2021-11-24 19:16:34 +01:00
parent b13ff06b36
commit c69e1c20ef
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/data/data.go
View File

@ -6,7 +6,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/cyrilix/robocar-tools/record" "github.com/cyrilix/robocar-tools/record"
log "github.com/sirupsen/logrus" "go.uber.org/zap"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
@ -31,7 +31,8 @@ func WriteArchive(basedir string, archiveName string, sliceSize int) error {
} }
func BuildArchive(basedir string, sliceSize int) ([]byte, error) { func BuildArchive(basedir string, sliceSize int) ([]byte, error) {
log.Printf("build zip archive from %s\n", basedir) l := zap.S()
l.Infof("build zip archive from %s\n", basedir)
dirItems, err := ioutil.ReadDir(basedir) dirItems, err := ioutil.ReadDir(basedir)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to list directory in %v dir: %w", basedir, err) return nil, fmt.Errorf("unable to list directory in %v dir: %w", basedir, err)
@ -41,7 +42,7 @@ func BuildArchive(basedir string, sliceSize int) ([]byte, error) {
records := make([]string, 0) records := make([]string, 0)
for _, dirItem := range dirItems { for _, dirItem := range dirItems {
log.Debugf("process %v directory", dirItem) l.Infof("process %v directory", dirItem.Name())
imgDir := path.Join(basedir, dirItem.Name(), camSubDir) imgDir := path.Join(basedir, dirItem.Name(), camSubDir)
imgs, err := ioutil.ReadDir(imgDir) imgs, err := ioutil.ReadDir(imgDir)
if err != nil { if err != nil {
@ -53,7 +54,7 @@ func BuildArchive(basedir string, sliceSize int) ([]byte, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to find index in cam image name %v: %w", img.Name(), err) return nil, fmt.Errorf("unable to find index in cam image name %v: %w", img.Name(), err)
} }
log.Debugf("found image with index %v", idx) l.Debugf("found image with index %v", idx)
records = append(records, path.Join(basedir, dirItem.Name(), fmt.Sprintf(record.RecorNameFormat, idx))) records = append(records, path.Join(basedir, dirItem.Name(), fmt.Sprintf(record.RecorNameFormat, idx)))
imgCams = append(imgCams, path.Join(basedir, dirItem.Name(), camSubDir, img.Name())) imgCams = append(imgCams, path.Join(basedir, dirItem.Name(), camSubDir, img.Name()))
} }
@ -67,7 +68,7 @@ func BuildArchive(basedir string, sliceSize int) ([]byte, error) {
if err != nil { if err != nil {
return nil , fmt.Errorf("unable to generate archive content: %w", err) return nil , fmt.Errorf("unable to generate archive content: %w", err)
} }
log.Printf("archive built\n") l.Info("archive built\n")
return content, nil return content, nil
} }
@ -84,7 +85,7 @@ var indexRegexp *regexp.Regexp
func init() { func init() {
re, err := regexp.Compile("image_array_(?P<idx>[0-9]+)\\.jpg$") re, err := regexp.Compile("image_array_(?P<idx>[0-9]+)\\.jpg$")
if err != nil { if err != nil {
log.Fatalf("unable to compile regex: %v", err) zap.S().Fatalf("unable to compile regex: %v", err)
} }
indexRegexp = re indexRegexp = re
} }