extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-19 17:27:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

use json logging when in subordinate mode (#789)

Browse Source
This commit is contained in:
Michael Quigley 2024-11-13 11:38:57 -05:00
parent 85a22950a7
commit 6b4dbaafb0
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zrok/accessPrivate.go
View File

@ -77,6 +77,10 @@ func newAccessPrivateCommand() *accessPrivateCommand {
} }
func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) { func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
if cmd.subordinate {
logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano})
}
root, err := environment.LoadRoot() root, err := environment.LoadRoot()
if err != nil { if err != nil {
cmd.error(err) cmd.error(err)

5
cmd/zrok/sharePrivate.go
View File

@ -26,6 +26,7 @@ import (
"os/signal" "os/signal"
"path/filepath" "path/filepath"
"syscall" "syscall"
"time"
) )
func init() { func init() {
@ -70,6 +71,10 @@ func newSharePrivateCommand() *sharePrivateCommand {
} }
func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) { func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
if cmd.subordinate {
logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano})
}
root, err := environment.LoadRoot() root, err := environment.LoadRoot()
if err != nil { if err != nil {
cmd.error("error loading environment", err) cmd.error("error loading environment", err)

4
cmd/zrok/sharePublic.go
View File

@ -85,6 +85,10 @@ func newSharePublicCommand() *sharePublicCommand {
} }
func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) { func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
if cmd.subordinate {
logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano})
}
root, err := environment.LoadRoot() root, err := environment.LoadRoot()
if err != nil { if err != nil {
cmd.error("error loading environment", err) cmd.error("error loading environment", err)

5
cmd/zrok/shareReserved.go
View File

@ -25,6 +25,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"time"
) )
func init() { func init() {
@ -65,6 +66,10 @@ func newShareReservedCommand() *shareReservedCommand {
} }
func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) { func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
if cmd.subordinate {
logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: time.RFC3339Nano})
}
root, err := environment.LoadRoot() root, err := environment.LoadRoot()
if err != nil { if err != nil {
cmd.error("error loading environment", err) cmd.error("error loading environment", err)