From b842709a3c0d66d008250235bfaefbed0512927b Mon Sep 17 00:00:00 2001
From: Eslam-Nawara <eslamnawara44@gmail.com>
Date: Sun, 19 Jan 2025 16:35:10 +0200
Subject: [PATCH] move main function to registrar.go

---
 node-registrar/Makefile                       |  6 ++---
 node-registrar/cmds/{main.go => registrar.go} | 24 +++++++++++++------
 node-registrar/main.go                        |  7 ------
 3 files changed, 20 insertions(+), 17 deletions(-)
 rename node-registrar/cmds/{main.go => registrar.go} (86%)
 delete mode 100644 node-registrar/main.go

diff --git a/node-registrar/Makefile b/node-registrar/Makefile
index f2eeb194..e1d4cbc2 100644
--- a/node-registrar/Makefile
+++ b/node-registrar/Makefile
@@ -1,5 +1,5 @@
 run:
-	go run main.go --postgres-host localhost --postgres-port 5432 --postgres-db postgres --postgres-user postgres --postgres-password password --domain localhost --server-port 8080
+	go run cmds/registrar.go --postgres-host localhost --postgres-port 5432 --postgres-db postgres --postgres-user postgres --postgres-password password --domain localhost --server-port 8080
 
 postgres:
 	docker run --name postgres -e POSTGRES_USER=postgres POSTGRES_PASSWORD=password POSTGRES_DB=postgres -p 5432:5432 -d postgres
@@ -8,10 +8,10 @@ stop-postgres:
 	docker stop postgres && docker rm postgres
 
 build: ## Bulil the server
-	go build -o bin/server main.go
+	go build -o bin/server cmds/registrar.go
 
 server-start:
-	@go run main.go \
+	@go run cmds/registrar.go \
 		--server-port :8080 \
 		--log-level debug \
 		--domain localhost \
diff --git a/node-registrar/cmds/main.go b/node-registrar/cmds/registrar.go
similarity index 86%
rename from node-registrar/cmds/main.go
rename to node-registrar/cmds/registrar.go
index fe713c97..b2954856 100644
--- a/node-registrar/cmds/main.go
+++ b/node-registrar/cmds/registrar.go
@@ -1,4 +1,4 @@
-package cmds
+package main
 
 import (
 	"flag"
@@ -27,7 +27,13 @@ var (
 	version string
 )
 
-func Run() {
+func main() {
+	if err := Run(); err != nil {
+		log.Fatal().Err(err).Send()
+	}
+}
+
+func Run() error {
 	f := flags{}
 	var sqlLogLevel int
 	flag.StringVar(&f.PostgresHost, "postgres-host", "", "postgres host")
@@ -49,11 +55,11 @@ func Run() {
 
 	if f.version {
 		log.Info().Str("version", version).Str("commit", commit).Send()
-		return
+		return nil
 	}
 
 	if err := f.validate(); err != nil {
-		log.Error().Err(err).Send()
+		return err
 	}
 
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
@@ -63,18 +69,19 @@ func Run() {
 
 	db, err := db.NewDB(f.Config)
 	if err != nil {
-		log.Fatal().Err(err).Msg("failed to open database with the specified configurations")
+		return errors.Wrap(err, "failed to open database with the specified configurations")
 	}
 
 	s, err := server.NewServer(db)
 	if err != nil {
-		log.Fatal().Err(err).Msg("failed to start gin server")
+		return errors.Wrap(err, "failed to start gin server")
 	}
 
 	err = s.Run(fmt.Sprintf("%s:%d", f.domain, f.serverPort))
 	if err != nil {
-		log.Fatal().Err(err).Msg("failed to run gin server")
+		return errors.Wrap(err, "failed to run gin server")
 	}
+	return nil
 }
 
 func (f flags) validate() error {
@@ -91,3 +98,6 @@ func (f flags) validate() error {
 
 	return f.Config.Validate()
 }
+
+// 
+// registar
diff --git a/node-registrar/main.go b/node-registrar/main.go
deleted file mode 100644
index e4a50ea9..00000000
--- a/node-registrar/main.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-import "github.com/threefoldtech/tfgrid-sdk-go/node-registrar/cmds"
-
-func main() {
-	cmds.Run()
-}