From b30b62ef77d83af6a5f51cb658861f29b8b5920d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= Date: Thu, 14 Oct 2021 10:18:01 +0300 Subject: [PATCH] Move `cli/logger` to `shared`, and refactor all its usages in `cli` (#349) * Move `cli/logger` to `shared`, and refactor all its usages in `cli` * Remove indirect for `op/go-logging` in `shared` --- agent/go.sum | 2 ++ cli/apiserver/provider.go | 10 +++++----- cli/auth/authProvider.go | 13 +++++++------ cli/cmd/common.go | 3 +-- cli/cmd/config.go | 3 ++- cli/cmd/logs.go | 3 ++- cli/cmd/root.go | 7 ++++--- cli/cmd/tap.go | 5 +++-- cli/cmd/tapRunner.go | 29 +++++++++++++++-------------- cli/cmd/version.go | 9 +++++---- cli/cmd/viewRunner.go | 5 +++-- cli/config/config.go | 5 +++-- cli/kubernetes/provider.go | 20 ++++++++++---------- cli/kubernetes/proxy.go | 5 +++-- cli/mizu/fsUtils/mizuLogsUtils.go | 16 +++++++++++----- cli/mizu/fsUtils/zipUtils.go | 3 ++- cli/mizu/goUtils/funcWrappers.go | 3 ++- cli/mizu/version/versionCheck.go | 7 ++++--- cli/telemetry/telemetry.go | 5 +++-- cli/uiUtils/openBrowser.go | 3 ++- shared/go.mod | 1 + shared/go.sum | 2 ++ {cli => shared}/logger/logger.go | 17 ++++------------- 23 files changed, 96 insertions(+), 80 deletions(-) rename {cli => shared}/logger/logger.go (68%) diff --git a/agent/go.sum b/agent/go.sum index 75977af59..454a8fc95 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -241,6 +241,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU= github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= diff --git a/cli/apiserver/provider.go b/cli/apiserver/provider.go index 7ac39f178..09f0c2014 100644 --- a/cli/apiserver/provider.go +++ b/cli/apiserver/provider.go @@ -4,14 +4,15 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/up9inc/mizu/cli/config" - "github.com/up9inc/mizu/cli/logger" - "github.com/up9inc/mizu/shared" "io/ioutil" - core "k8s.io/api/core/v1" "net/http" "net/url" "time" + + "github.com/up9inc/mizu/cli/config" + "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/shared/logger" + core "k8s.io/api/core/v1" ) type apiServerProvider struct { @@ -108,7 +109,6 @@ func (provider *apiServerProvider) GetGeneralStats() (map[string]interface{}, er return generalStats, nil } - func (provider *apiServerProvider) GetVersion() (string, error) { if !provider.isReady { return "", fmt.Errorf("trying to reach api server when not initialized yet") diff --git a/cli/auth/authProvider.go b/cli/auth/authProvider.go index 0e065e15c..c5f2d0e39 100644 --- a/cli/auth/authProvider.go +++ b/cli/auth/authProvider.go @@ -4,16 +4,17 @@ import ( "context" "errors" "fmt" - "github.com/google/uuid" - "github.com/up9inc/mizu/cli/config" - "github.com/up9inc/mizu/cli/config/configStructs" - "github.com/up9inc/mizu/cli/logger" - "github.com/up9inc/mizu/cli/uiUtils" - "golang.org/x/oauth2" "net" "net/http" "os" "time" + + "github.com/google/uuid" + "github.com/up9inc/mizu/cli/config" + "github.com/up9inc/mizu/cli/config/configStructs" + "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/shared/logger" + "golang.org/x/oauth2" ) const loginTimeoutInMin = 2 diff --git a/cli/cmd/common.go b/cli/cmd/common.go index b60de5a8d..b9c8f87f3 100644 --- a/cli/cmd/common.go +++ b/cli/cmd/common.go @@ -11,9 +11,9 @@ import ( "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/kubernetes" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/shared/logger" ) func GetApiServerUrl() string { @@ -46,4 +46,3 @@ func waitForFinish(ctx context.Context, cancel context.CancelFunc) { cancel() } } - diff --git a/cli/cmd/config.go b/cli/cmd/config.go index 41e12930a..d6ee55074 100644 --- a/cli/cmd/config.go +++ b/cli/cmd/config.go @@ -2,13 +2,14 @@ package cmd import ( "fmt" + "github.com/creasty/defaults" "github.com/spf13/cobra" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/telemetry" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/shared/logger" ) var configCmd = &cobra.Command{ diff --git a/cli/cmd/logs.go b/cli/cmd/logs.go index 3309f86fd..009cc641f 100644 --- a/cli/cmd/logs.go +++ b/cli/cmd/logs.go @@ -2,15 +2,16 @@ package cmd import ( "context" + "github.com/creasty/defaults" "github.com/spf13/cobra" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/errormessage" "github.com/up9inc/mizu/cli/kubernetes" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/telemetry" + "github.com/up9inc/mizu/shared/logger" ) var logsCmd = &cobra.Command{ diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 39729b6f5..9c40d6647 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -2,15 +2,16 @@ package cmd import ( "fmt" + "time" + "github.com/creasty/defaults" "github.com/spf13/cobra" "github.com/up9inc/mizu/cli/config" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/mizu/version" "github.com/up9inc/mizu/cli/uiUtils" - "time" + "github.com/up9inc/mizu/shared/logger" ) var rootCmd = &cobra.Command{ @@ -50,7 +51,7 @@ func Execute() { if err := fsUtils.EnsureDir(mizu.GetMizuFolderPath()); err != nil { logger.Log.Errorf("Failed to use mizu folder, %v", err) } - logger.InitLogger() + logger.InitLogger(fsUtils.GetLogFilePath()) versionChan := make(chan string) defer printNewVersionIfNeeded(versionChan) diff --git a/cli/cmd/tap.go b/cli/cmd/tap.go index dfb9ff539..e809b3b6a 100644 --- a/cli/cmd/tap.go +++ b/cli/cmd/tap.go @@ -3,17 +3,18 @@ package cmd import ( "errors" "fmt" + "os" + "github.com/creasty/defaults" "github.com/spf13/cobra" "github.com/up9inc/mizu/cli/auth" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/errormessage" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/telemetry" "github.com/up9inc/mizu/cli/uiUtils" "github.com/up9inc/mizu/shared" - "os" + "github.com/up9inc/mizu/shared/logger" ) const uploadTrafficMessageToConfirm = `NOTE: running mizu with --%s flag will upload recorded traffic for further analysis and enriched presentation options.` diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 922c372ed..1b445a3cc 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -16,8 +16,8 @@ import ( "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/errormessage" + "github.com/up9inc/mizu/cli/kubernetes" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/mizu/goUtils" @@ -25,6 +25,7 @@ import ( "github.com/up9inc/mizu/cli/uiUtils" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/debounce" + "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/tap/api" ) @@ -169,15 +170,15 @@ func createMizuApiServer(ctx context.Context, kubernetesProvider *kubernetes.Pro } opts := &kubernetes.ApiServerOptions{ - Namespace: config.Config.MizuResourcesNamespace, - PodName: mizu.ApiServerPodName, - PodImage: config.Config.AgentImage, - ServiceAccountName: serviceAccountName, - IsNamespaceRestricted: config.Config.IsNsRestrictedMode(), - SyncEntriesConfig: getSyncEntriesConfig(), - MaxEntriesDBSizeBytes: config.Config.Tap.MaxEntriesDBSizeBytes(), - Resources: config.Config.Tap.ApiServerResources, - ImagePullPolicy: config.Config.ImagePullPolicy(), + Namespace: config.Config.MizuResourcesNamespace, + PodName: mizu.ApiServerPodName, + PodImage: config.Config.AgentImage, + ServiceAccountName: serviceAccountName, + IsNamespaceRestricted: config.Config.IsNsRestrictedMode(), + SyncEntriesConfig: getSyncEntriesConfig(), + MaxEntriesDBSizeBytes: config.Config.Tap.MaxEntriesDBSizeBytes(), + Resources: config.Config.Tap.ApiServerResources, + ImagePullPolicy: config.Config.ImagePullPolicy(), } _, err = kubernetesProvider.CreateMizuApiServerPod(ctx, opts) if err != nil { @@ -295,7 +296,7 @@ func cleanUpMizuResources(ctx context.Context, cancel context.CancelFunc, kubern } if len(leftoverResources) > 0 { - errMsg := fmt.Sprintf("Failed to remove the following resources, for more info check logs at %s:", logger.GetLogFilePath()) + errMsg := fmt.Sprintf("Failed to remove the following resources, for more info check logs at %s:", fsUtils.GetLogFilePath()) for _, resource := range leftoverResources { errMsg += "\n- " + resource } @@ -562,14 +563,14 @@ func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provi if modifiedPod.Status.Phase == core.PodPending { if modifiedPod.Status.Conditions[0].Type == core.PodScheduled && modifiedPod.Status.Conditions[0].Status != core.ConditionTrue { logger.Log.Debugf("Wasn't able to deploy the API server. Reason: \"%s\"", modifiedPod.Status.Conditions[0].Message) - logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Wasn't able to deploy the API server, for more info check logs at %s", logger.GetLogFilePath())) + logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Wasn't able to deploy the API server, for more info check logs at %s", fsUtils.GetLogFilePath())) cancel() break } if len(modifiedPod.Status.ContainerStatuses) > 0 && modifiedPod.Status.ContainerStatuses[0].State.Waiting != nil && modifiedPod.Status.ContainerStatuses[0].State.Waiting.Reason == "ErrImagePull" { logger.Log.Debugf("Wasn't able to deploy the API server. (ErrImagePull) Reason: \"%s\"", modifiedPod.Status.ContainerStatuses[0].State.Waiting.Message) - logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Wasn't able to deploy the API server: failed to pull the image, for more info check logs at %v", logger.GetLogFilePath())) + logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Wasn't able to deploy the API server: failed to pull the image, for more info check logs at %v", fsUtils.GetLogFilePath())) cancel() break } @@ -581,7 +582,7 @@ func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provi url := GetApiServerUrl() if err := apiserver.Provider.InitAndTestConnection(url); err != nil { - logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Couldn't connect to API server, for more info check logs at %s", logger.GetLogFilePath())) + logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Couldn't connect to API server, for more info check logs at %s", fsUtils.GetLogFilePath())) cancel() break } diff --git a/cli/cmd/version.go b/cli/cmd/version.go index 816f92865..b6c21d48a 100644 --- a/cli/cmd/version.go +++ b/cli/cmd/version.go @@ -1,13 +1,14 @@ package cmd import ( - "github.com/up9inc/mizu/cli/config" - "github.com/up9inc/mizu/cli/config/configStructs" - "github.com/up9inc/mizu/cli/logger" - "github.com/up9inc/mizu/cli/telemetry" "strconv" "time" + "github.com/up9inc/mizu/cli/config" + "github.com/up9inc/mizu/cli/config/configStructs" + "github.com/up9inc/mizu/cli/telemetry" + "github.com/up9inc/mizu/shared/logger" + "github.com/creasty/defaults" "github.com/spf13/cobra" "github.com/up9inc/mizu/cli/mizu" diff --git a/cli/cmd/viewRunner.go b/cli/cmd/viewRunner.go index 499e6baf9..3c8c89a8b 100644 --- a/cli/cmd/viewRunner.go +++ b/cli/cmd/viewRunner.go @@ -8,10 +8,11 @@ import ( "github.com/up9inc/mizu/cli/apiserver" "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/kubernetes" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu" + "github.com/up9inc/mizu/cli/mizu/fsUtils" "github.com/up9inc/mizu/cli/mizu/version" "github.com/up9inc/mizu/cli/uiUtils" + "github.com/up9inc/mizu/shared/logger" ) func runMizuView() { @@ -50,7 +51,7 @@ func runMizuView() { go startProxyReportErrorIfAny(kubernetesProvider, cancel) if err := apiserver.Provider.InitAndTestConnection(GetApiServerUrl()); err != nil { - logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Couldn't connect to API server, for more info check logs at %s", logger.GetLogFilePath())) + logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Couldn't connect to API server, for more info check logs at %s", fsUtils.GetLogFilePath())) return } } diff --git a/cli/config/config.go b/cli/config/config.go index 788393929..b44e9219f 100644 --- a/cli/config/config.go +++ b/cli/config/config.go @@ -3,14 +3,15 @@ package config import ( "errors" "fmt" - "github.com/up9inc/mizu/cli/logger" - "github.com/up9inc/mizu/shared" "io/ioutil" "os" "reflect" "strconv" "strings" + "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/shared/logger" + "github.com/creasty/defaults" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cli/kubernetes/provider.go b/cli/kubernetes/provider.go index 512548605..c9547057a 100644 --- a/cli/kubernetes/provider.go +++ b/cli/kubernetes/provider.go @@ -12,7 +12,7 @@ import ( "strconv" "github.com/up9inc/mizu/cli/config/configStructs" - "github.com/up9inc/mizu/cli/logger" + "github.com/up9inc/mizu/shared/logger" "io" @@ -146,15 +146,15 @@ func (provider *Provider) CreateNamespace(ctx context.Context, name string) (*co } type ApiServerOptions struct { - Namespace string - PodName string - PodImage string - ServiceAccountName string - IsNamespaceRestricted bool - SyncEntriesConfig *shared.SyncEntriesConfig - MaxEntriesDBSizeBytes int64 - Resources configStructs.Resources - ImagePullPolicy core.PullPolicy + Namespace string + PodName string + PodImage string + ServiceAccountName string + IsNamespaceRestricted bool + SyncEntriesConfig *shared.SyncEntriesConfig + MaxEntriesDBSizeBytes int64 + Resources configStructs.Resources + ImagePullPolicy core.PullPolicy } func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiServerOptions) (*core.Pod, error) { diff --git a/cli/kubernetes/proxy.go b/cli/kubernetes/proxy.go index 8489f0b4a..e0b172273 100644 --- a/cli/kubernetes/proxy.go +++ b/cli/kubernetes/proxy.go @@ -2,12 +2,13 @@ package kubernetes import ( "fmt" - "github.com/up9inc/mizu/cli/logger" - "k8s.io/kubectl/pkg/proxy" "net" "net/http" "strings" "time" + + "github.com/up9inc/mizu/shared/logger" + "k8s.io/kubectl/pkg/proxy" ) const k8sProxyApiPrefix = "/" diff --git a/cli/mizu/fsUtils/mizuLogsUtils.go b/cli/mizu/fsUtils/mizuLogsUtils.go index 2f3605709..b28f03f35 100644 --- a/cli/mizu/fsUtils/mizuLogsUtils.go +++ b/cli/mizu/fsUtils/mizuLogsUtils.go @@ -4,14 +4,20 @@ import ( "archive/zip" "context" "fmt" + "os" + "path" + "regexp" + "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/cli/kubernetes" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu" - "os" - "regexp" + "github.com/up9inc/mizu/shared/logger" ) +func GetLogFilePath() string { + return path.Join(mizu.GetMizuFolderPath(), "mizu_cli.log") +} + func DumpLogs(ctx context.Context, provider *kubernetes.Provider, filePath string) error { podExactRegex := regexp.MustCompile("^" + mizu.MizuResourcesPrefix) pods, err := provider.ListAllPodsMatchingRegex(ctx, podExactRegex, []string{config.Config.MizuResourcesNamespace}) @@ -66,10 +72,10 @@ func DumpLogs(ctx context.Context, provider *kubernetes.Provider, filePath strin logger.Log.Debugf("Successfully added file %s", config.Config.ConfigFilePath) } - if err := AddFileToZip(zipWriter, logger.GetLogFilePath()); err != nil { + if err := AddFileToZip(zipWriter, GetLogFilePath()); err != nil { logger.Log.Debugf("Failed write file, %v", err) } else { - logger.Log.Debugf("Successfully added file %s", logger.GetLogFilePath()) + logger.Log.Debugf("Successfully added file %s", GetLogFilePath()) } logger.Log.Infof("You can find the zip file with all logs in %s\n", filePath) diff --git a/cli/mizu/fsUtils/zipUtils.go b/cli/mizu/fsUtils/zipUtils.go index 3c2c5fe93..51f0e5eba 100644 --- a/cli/mizu/fsUtils/zipUtils.go +++ b/cli/mizu/fsUtils/zipUtils.go @@ -3,11 +3,12 @@ package fsUtils import ( "archive/zip" "fmt" - "github.com/up9inc/mizu/cli/logger" "io" "os" "path/filepath" "strings" + + "github.com/up9inc/mizu/shared/logger" ) func AddFileToZip(zipWriter *zip.Writer, filename string) error { diff --git a/cli/mizu/goUtils/funcWrappers.go b/cli/mizu/goUtils/funcWrappers.go index fd1f5b1ce..92d646bb2 100644 --- a/cli/mizu/goUtils/funcWrappers.go +++ b/cli/mizu/goUtils/funcWrappers.go @@ -1,9 +1,10 @@ package goUtils import ( - "github.com/up9inc/mizu/cli/logger" "reflect" "runtime/debug" + + "github.com/up9inc/mizu/shared/logger" ) func HandleExcWrapper(fn interface{}, params ...interface{}) (result []reflect.Value) { diff --git a/cli/mizu/version/versionCheck.go b/cli/mizu/version/versionCheck.go index 4e0228d5c..db3d85fb6 100644 --- a/cli/mizu/version/versionCheck.go +++ b/cli/mizu/version/versionCheck.go @@ -3,15 +3,16 @@ package version import ( "context" "fmt" - "github.com/up9inc/mizu/cli/apiserver" - "github.com/up9inc/mizu/cli/logger" - "github.com/up9inc/mizu/cli/mizu" "io/ioutil" "net/http" "runtime" "strings" "time" + "github.com/up9inc/mizu/cli/apiserver" + "github.com/up9inc/mizu/cli/mizu" + "github.com/up9inc/mizu/shared/logger" + "github.com/google/go-github/v37/github" "github.com/up9inc/mizu/cli/uiUtils" "github.com/up9inc/mizu/shared/semver" diff --git a/cli/telemetry/telemetry.go b/cli/telemetry/telemetry.go index f0f9a8360..cc1f9bdbd 100644 --- a/cli/telemetry/telemetry.go +++ b/cli/telemetry/telemetry.go @@ -4,12 +4,13 @@ import ( "bytes" "encoding/json" "fmt" + "net/http" + "github.com/denisbrodbeck/machineid" "github.com/up9inc/mizu/cli/apiserver" "github.com/up9inc/mizu/cli/config" - "github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/mizu" - "net/http" + "github.com/up9inc/mizu/shared/logger" ) const telemetryUrl = "https://us-east4-up9-prod.cloudfunctions.net/mizu-telemetry" diff --git a/cli/uiUtils/openBrowser.go b/cli/uiUtils/openBrowser.go index 0f2998cf9..b8c58b7e3 100644 --- a/cli/uiUtils/openBrowser.go +++ b/cli/uiUtils/openBrowser.go @@ -2,9 +2,10 @@ package uiUtils import ( "fmt" - "github.com/up9inc/mizu/cli/logger" "os/exec" "runtime" + + "github.com/up9inc/mizu/shared/logger" ) func OpenBrowser(url string) { diff --git a/shared/go.mod b/shared/go.mod index 83dd85f40..e37d96152 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -5,5 +5,6 @@ go 1.16 require ( github.com/docker/go-units v0.4.0 github.com/golang-jwt/jwt/v4 v4.1.0 + github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/shared/go.sum b/shared/go.sum index d80d9eb99..2814edf69 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -2,6 +2,8 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= diff --git a/cli/logger/logger.go b/shared/logger/logger.go similarity index 68% rename from cli/logger/logger.go rename to shared/logger/logger.go index 050ccb36d..a75f47d41 100644 --- a/cli/logger/logger.go +++ b/shared/logger/logger.go @@ -1,24 +1,18 @@ package logger import ( - "github.com/op/go-logging" - "github.com/up9inc/mizu/cli/mizu" "os" - "path" + + "github.com/op/go-logging" ) -var Log = logging.MustGetLogger("mizu_cli") +var Log = logging.MustGetLogger("mizu") var format = logging.MustStringFormatter( `%{time} %{level:.5s} ▶ %{pid} %{shortfile} %{shortfunc} ▶ %{message}`, ) -func GetLogFilePath() string { - return path.Join(mizu.GetMizuFolderPath(), "mizu_cli.log") -} - -func InitLogger() { - logPath := GetLogFilePath() +func InitLogger(logPath string) { f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) if err != nil { Log.Infof("Failed to open mizu log file: %v, err %v", logPath, err) @@ -33,7 +27,4 @@ func InitLogger() { backend1Leveled.SetLevel(logging.INFO, "") logging.SetBackend(backend1Leveled, backend2Formatter) - - Log.Debugf("\n\n\n") - Log.Debugf("Running mizu version %v", mizu.SemVer) }