chore: rename fields to utils for server utilities

UnlockedLabs · Feb 3, 2025 · 94c3eff · 94c3eff
1 parent 87ca2b4
commit 94c3eff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/backend/src/handlers/fields.go → backend/src/handlers/utils.go b/backend/src/handlers/fields.go → backend/src/handlers/utils.go
@@ -6,42 +6,42 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // sLog is a wrapper around the log.Fields map and is implemented by the handleError method, this struct is not intended to be accessed directly and was created to make adding key/values and logging more efficient.
-type sLog struct{ f log.Fields }
+type sLog struct{ f logrus.Fields }
 
 func (slog sLog) info(args ...interface{}) {
-	log.WithFields(slog.f).Info(args...)
+	logrus.WithFields(slog.f).Info(args...)
 }
 
 func (slog sLog) infof(format string, args ...interface{}) {
-	log.WithFields(slog.f).Infof(format, args...)
+	logrus.WithFields(slog.f).Infof(format, args...)
 }
 
 func (slog sLog) debug(args ...interface{}) {
-	log.WithFields(slog.f).Debug(args...)
+	logrus.WithFields(slog.f).Debug(args...)
 }
 
 func (slog sLog) debugf(format string, args ...interface{}) {
-	log.WithFields(slog.f).Debugf(format, args...)
+	logrus.WithFields(slog.f).Debugf(format, args...)
 }
 
 func (slog sLog) warn(args ...interface{}) {
-	log.WithFields(slog.f).Warn(args...)
+	logrus.WithFields(slog.f).Warn(args...)
 }
 
 func (slog sLog) warnf(format string, args ...interface{}) {
-	log.WithFields(slog.f).Warnf(format, args...)
+	logrus.WithFields(slog.f).Warnf(format, args...)
 }
 
 func (slog sLog) error(args ...interface{}) {
-	log.WithFields(slog.f).Error(args...)
+	logrus.WithFields(slog.f).Error(args...)
 }
 
 func (slog sLog) errorf(format string, args ...interface{}) {
-	log.WithFields(slog.f).Errorf(format, args...)
+	logrus.WithFields(slog.f).Errorf(format, args...)
 }
 
 func (slog *sLog) add(key string, value interface{}) {

diff --git a/backend/tasks/main.go b/backend/tasks/main.go
@@ -17,6 +17,7 @@ func main() {
 	if err != nil {
 		log.Error("error loading .env file, using default env variables")
 	}
+	dev := os.Getenv("APP_ENV") == "dev"
 	initLogging()
 	runner := newJobRunner()
 	scheduler, err := gocron.NewScheduler()
@@ -45,7 +46,9 @@ func main() {
 			hour = 1
 		}
 	}
-	runner.execute()
+	if !dev {
+		runner.execute()
+	}
 	scheduler.Start()
 	shutdown := make(chan os.Signal, 1)
 	signal.Notify(shutdown, syscall.SIGINT, syscall.SIGTERM)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -116,6 +116,7 @@ services:
       context: .
       dockerfile: ./backend/tasks/dev.Dockerfile
     environment:
+      - APP_ENV=dev
       - LOG_LEVEL=debug
       - NATS_URL=nats:4222
       - NATS_USER=unlocked