Move entirely to zerolog

Makefile

@@ -1,5 +1,5 @@
 DOCKER_RUN_GO_VERSION=1.16
-GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./.git/*")
+GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./.git/*" -not -name "*.pb.go")
 GO_PACKAGES ?= $(shell go list ./... | grep -v /vendor/)
 
 VERSION ?= next
@@ -31,6 +31,9 @@ formatcheck:
 format:
 	@gofmt -w ${GOFILES_NOVENDOR}
 
+imports:
+	@goimports -local "github.com/woodpecker-ci" -w ${GOFILES_NOVENDOR}
+
 .PHONY: clean
 clean:
 	go clean -i ./...
@@ -41,6 +44,11 @@ vet:
 	@echo "Running go vet..."
 	@go vet $(GO_PACKAGES)
 
+.PHONY: lint
+lint:
+	go run vendor/github.com/rs/zerolog/cmd/lint/lint.go github.com/woodpecker-ci/woodpecker/cmd/agent
+	go run vendor/github.com/rs/zerolog/cmd/lint/lint.go github.com/woodpecker-ci/woodpecker/cmd/server
+
 test-agent:
 	$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/agent $(GO_PACKAGES)
 

agent/runner.go

@@ -23,15 +23,14 @@ import (
 	"sync"
 	"time"
 
+	"github.com/rs/zerolog/log"
+	"github.com/tevino/abool"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/woodpecker-ci/woodpecker/pipeline"
 	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 	"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
 	"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
-
-	"github.com/rs/zerolog/log"
-	"github.com/tevino/abool"
 )
 
 // TODO: Implement log streaming.

cli/build/build_approve.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_decline.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_info.go

@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_kill.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_last.go

@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_list.go

@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_ps.go

@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_queue.go

@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_start.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/build/build_stop.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/deploy/deploy.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
-
-	"github.com/urfave/cli"
 )
 
 // Command exports the deploy command.

cli/exec/exec.go

@@ -5,13 +5,15 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
 
 	"github.com/drone/envsubst"
+	"github.com/rs/zerolog/log"
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/pipeline"
 	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 	"github.com/woodpecker-ci/woodpecker/pipeline/backend/docker"
@@ -22,8 +24,6 @@ import (
 	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/matrix"
 	"github.com/woodpecker-ci/woodpecker/pipeline/interrupt"
 	"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
-
-	"github.com/urfave/cli"
 )
 
 // Command exports the exec command.
@@ -33,7 +33,7 @@ var Command = cli.Command{
 	ArgsUsage: "[path/to/.woodpecker.yml]",
 	Action: func(c *cli.Context) {
 		if err := exec(c); err != nil {
-			log.Fatalln(err)
+			log.Fatal().Err(err).Msg("")
 		}
 	},
 	Flags: flags,

cli/lint/lint.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/pipeline/schema"
 )
 

cli/log/log_purge.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/registry/registry_add.go

@@ -4,10 +4,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
-
-	"github.com/urfave/cli"
 )
 
 var registryCreateCmd = cli.Command{

cli/registry/registry_info.go

@@ -4,9 +4,9 @@ import (
 	"html/template"
 	"os"
 
-	"github.com/woodpecker-ci/woodpecker/cli/internal"
-
 	"github.com/urfave/cli"
+
+	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 
 var registryInfoCmd = cli.Command{

cli/registry/registry_rm.go

@@ -1,9 +1,9 @@
 package registry
 
 import (
-	"github.com/woodpecker-ci/woodpecker/cli/internal"
-
 	"github.com/urfave/cli"
+
+	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 
 var registryDeleteCmd = cli.Command{

cli/registry/registry_set.go

@@ -4,10 +4,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
-
-	"github.com/urfave/cli"
 )
 
 var registryUpdateCmd = cli.Command{

cli/repo/repo_add.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/repo/repo_chown.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/repo/repo_info.go

@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/repo/repo_list.go

@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/repo/repo_repair.go

@@ -2,6 +2,7 @@ package repo
 
 import (
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/repo/repo_rm.go

@@ -3,9 +3,9 @@ package repo
 import (
 	"fmt"
 
-	"github.com/woodpecker-ci/woodpecker/cli/internal"
-
 	"github.com/urfave/cli"
+
+	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 
 var repoRemoveCmd = cli.Command{

cli/repo/repo_sync.go

@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

cli/repo/repo_update.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
-
-	"github.com/urfave/cli"
 )
 
 var repoUpdateCmd = cli.Command{

cli/secret/secret_add.go

@@ -4,10 +4,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
-
-	"github.com/urfave/cli"
 )
 
 var secretCreateCmd = cli.Command{

cli/secret/secret_set.go

@@ -4,10 +4,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
-
-	"github.com/urfave/cli"
 )
 
 var secretUpdateCmd = cli.Command{

cli/user/user_add.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
 
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
+	"github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker"
 )
 
 var userAddCmd = cli.Command{

cmd/agent/agent.go

@@ -21,21 +21,19 @@ import (
 	"os"
 	"sync"
 
-	grpccredentials "google.golang.org/grpc/credentials"
-
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+	"github.com/tevino/abool"
+	"github.com/urfave/cli"
+	oldcontext "golang.org/x/net/context"
 	"google.golang.org/grpc"
+	grpccredentials "google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/woodpecker-ci/woodpecker/agent"
 	"github.com/woodpecker-ci/woodpecker/pipeline/backend/docker"
 	"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
-
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-	"github.com/tevino/abool"
-	"github.com/urfave/cli"
-	oldcontext "golang.org/x/net/context"
 )
 
 func loop(c *cli.Context) error {

cmd/agent/health.go

@@ -20,6 +20,7 @@ import (
 	"net/http"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/agent"
 	"github.com/woodpecker-ci/woodpecker/version"
 )

cmd/agent/main.go

@@ -18,10 +18,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/woodpecker-ci/woodpecker/version"
-
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/urfave/cli"
+
+	"github.com/woodpecker-ci/woodpecker/version"
 )
 
 func main() {