More fixes

Sol-Armada · May 28, 2024 · 68da178 · 68da178
1 parent 51b8fac
commit 68da178
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -42,18 +42,20 @@ func init() {
 	}
 
 	// setup the logger
-	f, err := os.OpenFile(settings.GetStringWithDefault("LOG.FILE", "/var/log/solbot/solbot.log"), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		log.Fatal(err.Error())
-		os.Exit(1)
+	if settings.GetBool("LOG.CLI") {
+		handler := &customFormatter{hander: cli.New(os.Stdout)}
+		log.SetHandler(handler)
+	} else {
+		f, err := os.OpenFile(settings.GetStringWithDefault("LOG.FILE", "/var/log/solbot/solbot.log"), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			log.Fatal(err.Error())
+			os.Exit(1)
+		}
+		log.SetHandler(jsn.New(f))
 	}
-	log.SetHandler(jsn.New(f))
+
 	if settings.GetBool("LOG.DEBUG") {
 		log.SetLevel(log.DebugLevel)
-		if settings.GetBool("LOG.CLI") {
-			handler := &customFormatter{hander: cli.New(os.Stdout)}
-			log.SetHandler(handler)
-		}
 		log.Debug("debug mode on")
 	}
 

diff --git a/stores/attendance.go b/stores/attendance.go
@@ -330,8 +330,7 @@ func (s *AttendanceStore) GetCount(memberId string) (int, error) {
 																		},
 																	},
 																},
-																"-delta-",
-																bson.D{{Key: "$toString", Value: "$time_delta_hours"}},
+																"-overlap",
 															},
 														},
 													},
@@ -353,6 +352,7 @@ func (s *AttendanceStore) GetCount(memberId string) (int, error) {
 							},
 						},
 					},
+					{Key: "$match", Value: bson.D{{Key: "$not", Value: bson.D{{Key: "$regex", Value: "overlap"}}}}},
 					{Key: "names", Value: bson.D{{Key: "$push", Value: "$recordsWithPrev.current.name"}}},
 					{Key: "ids", Value: bson.D{{Key: "$push", Value: "$recordsWithPrev.current._id"}}},
 					{Key: "count", Value: bson.D{{Key: "$sum", Value: 1}}},