logger Default alias

vertex-center · Sep 10, 2023 · 6a7220b · 6a7220b
1 parent 6467d16
commit 6a7220b
Show file tree

Hide file tree

Showing 21 changed files with 106 additions and 86 deletions.
diff --git a/adapter/instance_fs.go b/adapter/instance_fs.go
@@ -36,7 +36,7 @@ func NewInstanceFSAdapter() types.InstanceAdapterPort {
 
 	err := os.MkdirAll(adapter.instancesPath, os.ModePerm)
 	if err != nil && !os.IsExist(err) {
-		log.Default.Error(err,
+		log.Error(err,
 			vlog.String("message", "failed to create directory"),
 			vlog.String("path", adapter.instancesPath),
 		)
@@ -108,7 +108,7 @@ func (a *InstanceFSAdapter) LoadSettings(i *types.Instance) error {
 	settingsBytes, err := os.ReadFile(settingsPath)
 
 	if errors.Is(err, os.ErrNotExist) {
-		log.Default.Warn("instance_settings.json not found. using default.")
+		log.Warn("instance_settings.json not found. using default.")
 	} else if err != nil {
 		return err
 	} else {
@@ -124,7 +124,7 @@ func (a *InstanceFSAdapter) LoadSettings(i *types.Instance) error {
 func (a *InstanceFSAdapter) ReadService(instancePath string) (types.Service, error) {
 	data, err := os.ReadFile(path.Join(instancePath, ".vertex", "service.yml"))
 	if err != nil {
-		log.Default.Warn("'.vertex/service.yml' file not found",
+		log.Warn("'.vertex/service.yml' file not found",
 			vlog.String("path", path.Dir(instancePath)),
 		)
 	}
@@ -182,27 +182,27 @@ func (a *InstanceFSAdapter) LoadEnv(i *types.Instance) error {
 func (a *InstanceFSAdapter) Reload(load func(uuid uuid.UUID)) {
 	entries, err := os.ReadDir(a.instancesPath)
 	if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 		os.Exit(1)
 	}
 
 	for _, entry := range entries {
 		info, err := entry.Info()
 		if err != nil {
-			log.Default.Error(err)
+			log.Error(err)
 			continue
 		}
 
 		isInstance := entry.IsDir() || info.Mode()&os.ModeSymlink != 0
 
 		if isInstance {
-			log.Default.Info("found instance",
+			log.Info("found instance",
 				vlog.String("uuid", entry.Name()),
 			)
 
 			id, err := uuid.Parse(entry.Name())
 			if err != nil {
-				log.Default.Error(err)
+				log.Error(err)
 				continue
 			}
 

diff --git a/adapter/instance_logs_fs.go b/adapter/instance_logs_fs.go
@@ -75,7 +75,7 @@ func (a *InstanceLogsFSAdapter) Close(uuid uuid.UUID) error {
 func (a *InstanceLogsFSAdapter) Push(uuid uuid.UUID, line types.LogLine) {
 	l, err := a.getLogger(uuid)
 	if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 		return
 	}
 	l.currentLine += 1
@@ -86,7 +86,7 @@ func (a *InstanceLogsFSAdapter) Push(uuid uuid.UUID, line types.LogLine) {
 
 	_, err = fmt.Fprintf(l.file, "%s\n", line.Message)
 	if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 	}
 }
 
@@ -127,17 +127,17 @@ func (a *InstanceLogsFSAdapter) startCron() {
 		for id := range a.loggers {
 			err := a.Close(id)
 			if err != nil {
-				log.Default.Error(err)
+				log.Error(err)
 				continue
 			}
 			err = a.Open(id)
 			if err != nil {
-				log.Default.Error(err)
+				log.Error(err)
 			}
 		}
 	})
 	if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 		return
 	}
 	s.StartAsync()

diff --git a/adapter/package_fs.go b/adapter/package_fs.go
@@ -45,7 +45,7 @@ func NewPackageFSAdapter(params *PackageFSAdapterParams) types.PackageAdapterPor
 
 	err := adapter.Reload()
 	if err != nil {
-		log.Default.Error(fmt.Errorf("failed to reload services: %v", err))
+		log.Error(fmt.Errorf("failed to reload services: %v", err))
 	}
 	return adapter
 }

diff --git a/adapter/proxy_fs.go b/adapter/proxy_fs.go
@@ -32,7 +32,7 @@ func NewProxyFSAdapter(params *ProxyFSAdapterParams) types.ProxyAdapterPort {
 
 	err := os.MkdirAll(params.proxyPath, os.ModePerm)
 	if err != nil && !os.IsExist(err) {
-		log.Default.Error(err,
+		log.Error(err,
 			vlog.String("message", "failed to create directory"),
 			vlog.String("path", params.proxyPath),
 		)
@@ -67,15 +67,15 @@ func (a *ProxyFSRepository) read() {
 	file, err := os.ReadFile(p)
 
 	if errors.Is(err, os.ErrNotExist) {
-		log.Default.Info("redirects.json doesn't exists or could not be found")
+		log.Info("redirects.json doesn't exists or could not be found")
 	} else if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 		return
 	}
 
 	err = json.Unmarshal(file, &a.redirects)
 	if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 		return
 	}
 }

diff --git a/adapter/runner_docker.go b/adapter/runner_docker.go
@@ -32,7 +32,7 @@ type dockerMessage struct {
 func NewRunnerDockerAdapter() RunnerDockerAdapter {
 	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
-		log.Default.Warn("couldn't connect with the Docker cli.",
+		log.Warn("couldn't connect with the Docker cli.",
 			vlog.String("error", err.Error()),
 		)
 
@@ -80,7 +80,7 @@ func (a RunnerDockerAdapter) Start(instance *types.Instance, onLog func(msg stri
 	if errors.Is(err, ErrContainerNotFound) {
 		containerName := instance.DockerContainerName()
 
-		log.Default.Info("container doesn't exists, create it.",
+		log.Info("container doesn't exists, create it.",
 			vlog.String("container_name", containerName),
 		)
 
@@ -228,12 +228,12 @@ func (a RunnerDockerAdapter) CheckForUpdates(instance *types.Instance) error {
 	}
 
 	if latestImageID == currentImageID {
-		log.Default.Info("already up-to-date",
+		log.Info("already up-to-date",
 			vlog.String("uuid", instance.UUID.String()),
 		)
 		instance.Update = nil
 	} else {
-		log.Default.Info("a new update is available",
+		log.Info("a new update is available",
 			vlog.String("uuid", instance.UUID.String()),
 		)
 		instance.Update = &types.InstanceUpdate{
@@ -344,7 +344,7 @@ func (a RunnerDockerAdapter) buildImageFromDockerfile(instancePath string, image
 		msg := dockerMessage{}
 		err := json.Unmarshal(scanner.Bytes(), &msg)
 		if err != nil {
-			log.Default.Warn("Failed to parse message",
+			log.Warn("Failed to parse message",
 				vlog.String("message", scanner.Text()),
 			)
 		} else {
@@ -354,7 +354,7 @@ func (a RunnerDockerAdapter) buildImageFromDockerfile(instancePath string, image
 		}
 	}
 
-	log.Default.Info("Docker build: success.")
+	log.Info("Docker build: success.")
 	return nil
 }
 
@@ -388,7 +388,7 @@ func (a RunnerDockerAdapter) createContainer(options createContainerOptions) (st
 
 	res, err := a.cli.ContainerCreate(context.Background(), &config, &hostConfig, nil, nil, options.containerName)
 	for _, warn := range res.Warnings {
-		log.Default.Warn("warning while creating container",
+		log.Warn("warning while creating container",
 			vlog.String("warning", warn),
 		)
 	}
@@ -402,12 +402,12 @@ func (a RunnerDockerAdapter) watchForStatusChange(containerID string, instance *
 		select {
 		case err := <-errChan:
 			if err != nil {
-				log.Default.Error(err,
+				log.Error(err,
 					vlog.String("uuid", instance.UUID.String()),
 				)
 			}
 		case status := <-resChan:
-			log.Default.Info("container exited",
+			log.Info("container exited",
 				vlog.String("uuid", instance.UUID.String()),
 				vlog.Int64("status", status.StatusCode),
 			)
@@ -426,7 +426,7 @@ func (a RunnerDockerAdapter) watchForLogs(containerID string, instance *types.In
 			Tail:       "0",
 		})
 		if err != nil {
-			log.Default.Error(err,
+			log.Error(err,
 				vlog.String("uuid", instance.UUID.String()),
 			)
 		}
@@ -436,7 +436,7 @@ func (a RunnerDockerAdapter) watchForLogs(containerID string, instance *types.In
 			onLog(scanner.Text())
 		}
 		_ = logs.Close()
-		log.Default.Info("logs pipe closed",
+		log.Info("logs pipe closed",
 			vlog.String("uuid", instance.UUID.String()),
 		)
 	}()

diff --git a/adapter/runner_fs.go b/adapter/runner_fs.go
@@ -31,7 +31,7 @@ func (a RunnerFSAdapter) Delete(instance *types.Instance) error {
 
 func (a RunnerFSAdapter) Start(instance *types.Instance, onLog func(msg string), onErr func(msg string), setStatus func(status string)) error {
 	if a.commands[instance.UUID] != nil {
-		log.Default.Error(errors.New("runner already started"),
+		log.Error(errors.New("runner already started"),
 			vlog.String("name", instance.Name),
 		)
 	}
@@ -102,7 +102,7 @@ func (a RunnerFSAdapter) Start(instance *types.Instance, onLog func(msg string),
 	go func() {
 		err := cmd.Wait()
 		if err != nil {
-			log.Default.Error(err,
+			log.Error(err,
 				vlog.String("name", instance.Service.Name),
 			)
 		}

diff --git a/adapter/service_fs.go b/adapter/service_fs.go
@@ -34,7 +34,7 @@ func NewServiceFSAdapter(params *ServiceFSAdapterParams) types.ServiceAdapterPor
 	}
 	err := adapter.Reload()
 	if err != nil {
-		log.Default.Error(fmt.Errorf("failed to reload services: %v", err))
+		log.Error(fmt.Errorf("failed to reload services: %v", err))
 	}
 	return adapter
 }

diff --git a/adapter/settings_fs.go b/adapter/settings_fs.go
@@ -31,7 +31,7 @@ func NewSettingsFSAdapter(params *SettingsFSAdapterParams) types.SettingsAdapter
 
 	err := os.MkdirAll(params.settingsPath, os.ModePerm)
 	if err != nil && !os.IsExist(err) {
-		log.Default.Error(err,
+		log.Error(err,
 			vlog.String("message", "failed to create directory"),
 			vlog.String("path", params.settingsPath),
 		)
@@ -44,7 +44,7 @@ func NewSettingsFSAdapter(params *SettingsFSAdapterParams) types.SettingsAdapter
 
 	err = adapter.read()
 	if err != nil {
-		log.Default.Error(err)
+		log.Error(err)
 	}
 
 	return adapter
@@ -74,7 +74,7 @@ func (a *SettingsFSAdapter) read() error {
 	file, err := os.ReadFile(p)
 
 	if errors.Is(err, os.ErrNotExist) {
-		log.Default.Info("settings.json doesn't exists or could not be found")
+		log.Info("settings.json doesn't exists or could not be found")
 		return nil
 	} else if err != nil {
 		return err

diff --git a/init.go b/init.go
@@ -23,21 +23,21 @@ var (
 )
 
 func main() {
-	defer log.Default.Close()
+	defer log.Defaul.Close()
 
-	log.Default.Info("Vertex starting...")
+	log.Info("Vertex starting...")
 
 	parseArgs()
 
 	err := setupDependencies()
 	if err != nil {
-		log.Default.Error(fmt.Errorf("failed to setup dependencies: %v", err))
+		log.Error(fmt.Errorf("failed to setup dependencies: %v", err))
 		return
 	}
 
 	err = config.Current.Apply()
 	if err != nil {
-		log.Default.Error(fmt.Errorf("failed to apply the current configuration: %v", err))
+		log.Error(fmt.Errorf("failed to apply the current configuration: %v", err))
 		return
 	}
 
@@ -54,7 +54,7 @@ func main() {
 	// Logs
 	url := fmt.Sprintf("http://%s", config.Current.Host)
 	fmt.Printf("\n-- Vertex Client :: %s\n\n", url)
-	log.Default.Info("Vertex started",
+	log.Info("Vertex started",
 		vlog.String("url", url),
 	)
 
@@ -98,7 +98,7 @@ func setupDependencies() error {
 	for _, dep := range dependencies {
 		err := setupDependency(dep)
 		if err != nil {
-			log.Default.Error(err)
+			log.Error(err)
 			os.Exit(1)
 		}
 	}

diff --git a/pkg/ginutils/logger.go b/pkg/ginutils/logger.go
@@ -9,7 +9,7 @@ import (
 func Logger(router string) gin.HandlerFunc {
 	return gin.LoggerWithFormatter(func(params gin.LogFormatterParams) string {
 		if params.ErrorMessage != "" {
-			log.Default.Request("request",
+			log.Request("request",
 				vlog.String("router", router),
 				vlog.String("method", params.Method),
 				vlog.Int("status", params.StatusCode),
@@ -20,7 +20,7 @@ func Logger(router string) gin.HandlerFunc {
 				vlog.String("error", params.ErrorMessage),
 			)
 		} else {
-			log.Default.Request("request",
+			log.Request("request",
 				vlog.String("router", router),
 				vlog.String("method", params.Method),
 				vlog.Int("status", params.StatusCode),

diff --git a/pkg/log/log.go b/pkg/log/log.go
@@ -2,8 +2,28 @@ package log
 
 import "github.com/vertex-center/vlog"
 
-var Default = *vlog.New(
+var Defaul = *vlog.New(
 	vlog.WithOutputStd(),
 	vlog.WithOutputFile("live/logs", vlog.LogFormatText),
 	vlog.WithOutputFile("live/logs", vlog.LogFormatJson),
 )
+
+func Debug(msg string, fields ...vlog.KeyValue) {
+	Defaul.Debug(msg, fields...)
+}
+
+func Info(msg string, fields ...vlog.KeyValue) {
+	Defaul.Info(msg, fields...)
+}
+
+func Warn(msg string, fields ...vlog.KeyValue) {
+	Defaul.Warn(msg, fields...)
+}
+
+func Error(err error, fields ...vlog.KeyValue) {
+	Defaul.Error(err, fields...)
+}
+
+func Request(msg string, fields ...vlog.KeyValue) {
+	Defaul.Request(msg, fields...)
+}