reorganize commands to keep things more consistent

lorenzocattaneo · Jul 13, 2021 · 9fa0257 · 9fa0257
1 parent 143ccfc
commit 9fa0257
Show file tree

Hide file tree

Showing 20 changed files with 960 additions and 584 deletions.
diff --git a/Procfile b/Procfile
@@ -1,3 +1,3 @@
-web: apollo-api
-scheduler: apollo-scheduler
-worker-notifications: apollo-worker-notifications
+web: apollo api
+scheduler: apollo scheduler
+worker-notifications: apollo worker --queue notifications --multiplier 12
diff --git a/cmd/apollo-api/accounts.go b/cmd/apollo-api/accounts.go
diff --git a/cmd/apollo-api/errors.go b/cmd/apollo-api/errors.go
diff --git a/cmd/apollo-api/main.go b/cmd/apollo-api/main.go
diff --git a/cmd/apollo-api/routes.go b/cmd/apollo-api/routes.go
diff --git a/cmd/apollo/main.go b/cmd/apollo/main.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+
+	"github.com/christianselig/apollo-backend/internal/cmd"
+)
+
+func main() {
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
+	defer cancel()
+
+	ret := cmd.Execute(ctx)
+	os.Exit(ret)
+}
diff --git a/go.mod b/go.mod
@@ -9,12 +9,11 @@ require (
 	github.com/adjust/rmq/v4 v4.0.1
 	github.com/go-co-op/gocron v1.6.2
 	github.com/go-redis/redis/v8 v8.11.0
-	github.com/heroku/x v0.0.31
 	github.com/jackc/pgx/v4 v4.11.0
 	github.com/joho/godotenv v1.3.0
 	github.com/julienschmidt/httprouter v1.3.0
-	github.com/lib/pq v1.10.1
 	github.com/sideshow/apns2 v0.20.0
 	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/cobra v1.2.1
 	github.com/valyala/fastjson v1.6.3
 )