Move entirely to zerolog (#426)

Completely switch to zerolog (Remove usage of logrus and std logger) Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: 6543 <6543@obermui.de>
woodpecker-ci · Oct 12, 2021 · 4276a04 · 4276a04
1 parent 9c85c8f
commit 4276a04
Show file tree

Hide file tree

Showing 160 changed files with 4,980 additions and 395 deletions.
diff --git a/agent/runner.go b/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.

diff --git a/cli/build/build_approve.go b/cli/build/build_approve.go
@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_decline.go b/cli/build/build_decline.go
@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_info.go b/cli/build/build_info.go
@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_kill.go b/cli/build/build_kill.go
@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_last.go b/cli/build/build_last.go
@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_list.go b/cli/build/build_list.go
@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_ps.go b/cli/build/build_ps.go
@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_queue.go b/cli/build/build_queue.go
@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_start.go b/cli/build/build_start.go
@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/build/build_stop.go b/cli/build/build_stop.go
@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/deploy/deploy.go b/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.

diff --git a/cli/exec/exec.go b/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,

diff --git a/cli/lint/lint.go b/cli/lint/lint.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/pipeline/schema"
 )
 

diff --git a/cli/log/log_purge.go b/cli/log/log_purge.go
@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/registry/registry_add.go b/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{

diff --git a/cli/registry/registry_info.go b/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{

diff --git a/cli/registry/registry_rm.go b/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{

diff --git a/cli/registry/registry_set.go b/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{

diff --git a/cli/repo/repo_add.go b/cli/repo/repo_add.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/repo/repo_chown.go b/cli/repo/repo_chown.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/repo/repo_info.go b/cli/repo/repo_info.go
@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/repo/repo_list.go b/cli/repo/repo_list.go
@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/repo/repo_repair.go b/cli/repo/repo_repair.go
@@ -2,6 +2,7 @@ package repo
 
 import (
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/repo/repo_rm.go b/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{

diff --git a/cli/repo/repo_sync.go b/cli/repo/repo_sync.go
@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/internal"
 )
 

diff --git a/cli/repo/repo_update.go b/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{

diff --git a/cli/secret/secret_add.go b/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{

diff --git a/cli/secret/secret_set.go b/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{

diff --git a/cli/user/user_add.go b/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{

diff --git a/cmd/agent/agent.go b/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 {

diff --git a/cmd/agent/health.go b/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"
 )

diff --git a/cmd/agent/main.go b/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() {

diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -18,6 +18,9 @@ import (
 	"fmt"
 	"os"
 
+	_ "github.com/joho/godotenv/autoload"
+	"github.com/urfave/cli"
+
 	"github.com/woodpecker-ci/woodpecker/cli/build"
 	"github.com/woodpecker-ci/woodpecker/cli/deploy"
 	"github.com/woodpecker-ci/woodpecker/cli/exec"
@@ -29,9 +32,6 @@ import (
 	"github.com/woodpecker-ci/woodpecker/cli/secret"
 	"github.com/woodpecker-ci/woodpecker/cli/user"
 	"github.com/woodpecker-ci/woodpecker/version"
-
-	_ "github.com/joho/godotenv/autoload"
-	"github.com/urfave/cli"
 )
 
 func main() {