Rename event-srv -> hub

deployments/docker/docker-compose.yml

@@ -24,7 +24,7 @@ services:
     image: creekorful/tdsh-crawler:latest
     command: >
       --log-level debug
-      --event-srv-uri amqp://guest:guest@rabbitmq:5672
+      --hub-uri amqp://guest:guest@rabbitmq:5672
       --tor-uri torproxy:9050
     restart: always
     depends_on:
@@ -34,7 +34,7 @@ services:
     image: creekorful/tdsh-scheduler:latest
     command: >
       --log-level debug
-      --event-srv-uri amqp://guest:guest@rabbitmq:5672
+      --hub-uri amqp://guest:guest@rabbitmq:5672
       --api-uri http://api:8080
       --api-token eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6InNjaGVkdWxlciIsInJpZ2h0cyI6eyJHRVQiOlsiL3YxL3Jlc291cmNlcyJdfX0.dBR6KLQp2h2srY-By3zikEznhQplLCtDrvOkcXP6USY
       --forbidden-extensions png
@@ -50,7 +50,7 @@ services:
     image: creekorful/tdsh-extractor:latest
     command: >
       --log-level debug
-      --event-srv-uri amqp://guest:guest@rabbitmq:5672
+      --hub-uri amqp://guest:guest@rabbitmq:5672
       --api-uri http://api:8080
       --api-token eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImV4dHJhY3RvciIsInJpZ2h0cyI6eyJQT1NUIjpbIi92MS9yZXNvdXJjZXMiXX19.mytGd_9zyK8y_T3fsWAmH8FnaBNr6qWefwCPDOx4in0
     restart: always
@@ -61,7 +61,7 @@ services:
     image: creekorful/tdsh-api:latest
     command: >
       --log-level debug
-      --event-srv-uri amqp://guest:guest@rabbitmq:5672
+      --hub-uri amqp://guest:guest@rabbitmq:5672
       --elasticsearch-uri http://elasticsearch:9200
       --signing-key K==M5RsU_DQa4_XSbkX?L27s^xWmde25
     restart: always

internal/api/api.go

@@ -22,7 +22,7 @@ func GetApp() *cli.App {
 		Usage:   "Trandoshan API component",
 		Flags: []cli.Flag{
 			logging.GetLogFlag(),
-			util.GetEventSrvURI(),
+			util.GetHubURI(),
 			&cli.StringFlag{
 				Name:     "elasticsearch-uri",
 				Usage:    "URI to the Elasticsearch server",
@@ -55,7 +55,7 @@ func execute(c *cli.Context) error {
 
 	log.Info().Str("ver", c.App.Version).
 		Str("elasticsearch-uri", c.String("elasticsearch-uri")).
-		Str("event-srv-uri", c.String("event-srv-uri")).
+		Str("hub-uri", c.String("hub-uri")).
 		Msg("Starting tdsh-api")
 
 	signingKey := []byte(c.String("signing-key"))

internal/api/service.go

@@ -22,9 +22,9 @@ type svc struct {
 
 func newService(c *cli.Context) (service, error) {
 	// Connect to the messaging server
-	pub, err := messaging.NewPublisher(c.String("event-srv-uri"))
+	pub, err := messaging.NewPublisher(c.String("hub-uri"))
 	if err != nil {
-		log.Err(err).Str("uri", c.String("event-srv-uri")).Msg("Error while connecting to event server")
+		log.Err(err).Str("uri", c.String("hub-uri")).Msg("Error while connecting to hub server")
 		return nil, err
 	}
 

internal/crawler/crawler.go

@@ -27,7 +27,7 @@ func GetApp() *cli.App {
 		Usage:   "Trandoshan crawler component",
 		Flags: []cli.Flag{
 			logging.GetLogFlag(),
-			util.GetEventSrvURI(),
+			util.GetHubURI(),
 			&cli.StringFlag{
 				Name:     "tor-uri",
 				Usage:    "URI to the TOR SOCKS proxy",
@@ -53,7 +53,7 @@ func execute(ctx *cli.Context) error {
 
 	log.Info().
 		Str("ver", ctx.App.Version).
-		Str("event-srv-uri", ctx.String("event-srv-uri")).
+		Str("hub-uri", ctx.String("hub-uri")).
 		Str("tor-uri", ctx.String("tor-uri")).
 		Strs("allowed-content-types", ctx.StringSlice("allowed-ct")).
 		Msg("Starting tdsh-crawler")
@@ -70,7 +70,7 @@ func execute(ctx *cli.Context) error {
 	})
 
 	// Create the subscriber
-	sub, err := messaging.NewSubscriber(ctx.String("event-srv-uri"))
+	sub, err := messaging.NewSubscriber(ctx.String("hub-uri"))
 	if err != nil {
 		return err
 	}

internal/extractor/extractor.go

@@ -29,7 +29,7 @@ func GetApp() *cli.App {
 		Usage:   "Trandoshan extractor component",
 		Flags: []cli.Flag{
 			logging.GetLogFlag(),
-			util.GetEventSrvURI(),
+			util.GetHubURI(),
 			util.GetAPIURIFlag(),
 			util.GetAPITokenFlag(),
 		},
@@ -42,14 +42,14 @@ func execute(ctx *cli.Context) error {
 
 	log.Info().
 		Str("ver", ctx.App.Version).
-		Str("event-srv-uri", ctx.String("event-srv-uri")).
+		Str("hub-uri", ctx.String("hub-uri")).
 		Str("api-uri", ctx.String("api-uri")).
 		Msg("Starting tdsh-extractor")
 
 	apiClient := util.GetAPIClient(ctx)
 
 	// Create the event subscriber
-	sub, err := messaging.NewSubscriber(ctx.String("event-srv-uri"))
+	sub, err := messaging.NewSubscriber(ctx.String("hub-uri"))
 	if err != nil {
 		return err
 	}

internal/scheduler/scheduler.go

@@ -23,7 +23,7 @@ func GetApp() *cli.App {
 		Usage:   "Trandoshan scheduler component",
 		Flags: []cli.Flag{
 			logging.GetLogFlag(),
-			util.GetEventSrvURI(),
+			util.GetHubURI(),
 			util.GetAPIURIFlag(),
 			util.GetAPITokenFlag(),
 			&cli.StringFlag{
@@ -46,7 +46,7 @@ func execute(ctx *cli.Context) error {
 
 	log.Info().
 		Str("ver", ctx.App.Version).
-		Str("event-srv-uri", ctx.String("event-srv-uri")).
+		Str("hub-uri", ctx.String("hub-uri")).
 		Str("api-uri", ctx.String("api-uri")).
 		Strs("forbidden-exts", ctx.StringSlice("forbidden-extensions")).
 		Dur("refresh-delay", refreshDelay).
@@ -56,7 +56,7 @@ func execute(ctx *cli.Context) error {
 	apiClient := util.GetAPIClient(ctx)
 
 	// Create the subscriber
-	sub, err := messaging.NewSubscriber(ctx.String("event-srv-uri"))
+	sub, err := messaging.NewSubscriber(ctx.String("hub-uri"))
 	if err != nil {
 		return err
 	}

internal/util/amqp.go

@@ -2,11 +2,11 @@ package util
 
 import "github.com/urfave/cli/v2"
 
-// GetEventSrvURI return the URI of the event server
-func GetEventSrvURI() *cli.StringFlag {
+// GetHubURI return the URI of the hub (event) server
+func GetHubURI() *cli.StringFlag {
 	return &cli.StringFlag{
-		Name:     "event-srv-uri",
-		Usage:    "URI to the event server",
+		Name:     "hub-uri",
+		Usage:    "URI to the hub (event) server",
 		Required: true,
 	}
 }