From 0c60bb544b2ca6fc414f112dbb38fc6ea9aa8a41 Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Mon, 8 Nov 2021 12:22:11 +0100
Subject: [PATCH] feat: start aggregator

---
 Makefile               |  1 -
 cmd/aggregator/main.go | 21 ---------------------
 cmd/server/main.go     | 11 +++++++++++
 go.mod                 |  1 +
 go.sum                 |  2 ++
 5 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 cmd/aggregator/main.go

diff --git a/Makefile b/Makefile
index 584467f..7692ce6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,4 +23,3 @@ test:
 
 build: 
 	go build -o ./build/server ./cmd/server/main.go
-	go build -o ./build/aggregator ./cmd/aggregator/main.go
\ No newline at end of file
diff --git a/cmd/aggregator/main.go b/cmd/aggregator/main.go
deleted file mode 100644
index eaa48c9..0000000
--- a/cmd/aggregator/main.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
-	"flag"
-	"time"
-
-	"github.com/status-im/dev-telemetry/telemetry"
-)
-
-func main() {
-	seconds := flag.Int("seconds", 3600, "Number of seconds to aggregate")
-	dataSourceName := flag.String("data-source-name", "", "DB URL")
-
-	flag.Parse()
-
-	db := telemetry.OpenDb(*dataSourceName)
-	defer db.Close()
-
-	aggregator := telemetry.NewAggregator(db)
-	aggregator.Run(time.Duration(*seconds) * time.Second)
-}
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 322b33c..23264dd 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -2,8 +2,11 @@ package main
 
 import (
 	"flag"
+	"time"
 
 	"github.com/status-im/dev-telemetry/telemetry"
+
+	"github.com/robfig/cron/v3"
 )
 
 func main() {
@@ -15,6 +18,14 @@ func main() {
 	db := telemetry.OpenDb(*dataSourceName)
 	defer db.Close()
 
+	aggregator := telemetry.NewAggregator(db)
+	c := cron.New()
+	c.AddFunc("* * * * *", func() {
+		aggregator.Run(time.Hour)
+	})
+	c.Start()
+	defer c.Stop()
+
 	server := telemetry.NewServer(db)
 	server.Start(*port)
 }
diff --git a/go.mod b/go.mod
index 00420c8..ffcf1b9 100644
--- a/go.mod
+++ b/go.mod
@@ -6,5 +6,6 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/lib/pq v1.10.3
 	github.com/mattn/go-sqlite3 v1.14.9
+	github.com/robfig/cron/v3 v3.0.1
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/go.sum b/go.sum
index 5386c44..bc38933 100644
--- a/go.sum
+++ b/go.sum
@@ -8,6 +8,8 @@ github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/K
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=