adding logging system

api/data.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"encoding/json"
-	"fmt"
 	"github.com/JackalLabs/sequoia/api/types"
 	"github.com/JackalLabs/sequoia/file_system"
 	"github.com/dgraph-io/badger/v4"
+	"github.com/rs/zerolog/log"
 	"net/http"
 )
 
@@ -20,14 +20,14 @@ func DumpDBHandler(db *badger.DB) func(http.ResponseWriter, *http.Request) {
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 			return
 		}
 
 		err = json.NewEncoder(w).Encode(dump)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err)
 		}
 
 	}

api/file_handler.go

@@ -9,6 +9,7 @@ import (
 	"github.com/dgraph-io/badger/v4"
 	"github.com/gorilla/mux"
 	storageTypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
+	"github.com/rs/zerolog/log"
 	"net/http"
 )
 
@@ -24,7 +25,7 @@ func PostFileHandler(db *badger.DB, q *queue.Queue, address string) func(http.Re
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 			return
 		}
@@ -38,7 +39,7 @@ func PostFileHandler(db *badger.DB, q *queue.Queue, address string) func(http.Re
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 			return
 		}
@@ -51,7 +52,7 @@ func PostFileHandler(db *badger.DB, q *queue.Queue, address string) func(http.Re
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 		}
 
@@ -70,7 +71,7 @@ func PostFileHandler(db *badger.DB, q *queue.Queue, address string) func(http.Re
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 		}
 
@@ -85,7 +86,7 @@ func PostFileHandler(db *badger.DB, q *queue.Queue, address string) func(http.Re
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 		}
 
@@ -96,7 +97,7 @@ func PostFileHandler(db *badger.DB, q *queue.Queue, address string) func(http.Re
 
 		err = json.NewEncoder(w).Encode(resp)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err)
 		}
 	}
 }

api/files.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"encoding/json"
-	"fmt"
 	"github.com/JackalLabs/sequoia/api/types"
 	"github.com/JackalLabs/sequoia/file_system"
 	"github.com/dgraph-io/badger/v4"
+	"github.com/rs/zerolog/log"
 	"net/http"
 )
 
@@ -20,14 +20,14 @@ func ListFilesHandler(db *badger.DB) func(http.ResponseWriter, *http.Request) {
 			w.WriteHeader(http.StatusInternalServerError)
 			err = json.NewEncoder(w).Encode(v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err)
 			}
 			return
 		}
 
 		err = json.NewEncoder(w).Encode(files)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err)
 		}
 
 	}

api/index.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"encoding/json"
-	"fmt"
 	"github.com/JackalLabs/sequoia/api/types"
 	"github.com/desmos-labs/cosmos-go-wallet/wallet"
+	"github.com/rs/zerolog/log"
 	"net/http"
 )
 
@@ -18,7 +18,7 @@ func IndexHandler(address string) func(http.ResponseWriter, *http.Request) {
 
 		err := json.NewEncoder(w).Encode(v)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err)
 			return
 		}
 	}
@@ -40,7 +40,7 @@ func VersionHandler(wallet *wallet.Wallet) func(http.ResponseWriter, *http.Reque
 
 		err = json.NewEncoder(w).Encode(v)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err)
 			return
 		}
 	}

cmd/init.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"fmt"
 	"github.com/JackalLabs/sequoia/config"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -21,7 +21,7 @@ func InitCmd() *cobra.Command {
 				panic(err)
 			}
 
-			fmt.Println(wallet.AccAddress())
+			log.Info().Msg(wallet.AccAddress())
 
 		},
 	}

cmd/root.go

@@ -1,12 +1,18 @@
 package cmd
 
 import (
-	"fmt"
 	"github.com/JackalLabs/sequoia/cmd/wallet"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"os"
 )
 
+func init() {
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+
+}
+
 func RootCmd() *cobra.Command {
 	r := &cobra.Command{
 		Use:   "sequoia",
@@ -20,7 +26,8 @@ func RootCmd() *cobra.Command {
 
 func Execute(rootCmd *cobra.Command) {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
+
+		log.Error().Err(err)
 		os.Exit(1)
 	}
 }

cmd/wallet/wallet.go

@@ -3,6 +3,7 @@ package wallet
 import (
 	"fmt"
 	"github.com/JackalLabs/sequoia/config"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +29,7 @@ func addressCmd() *cobra.Command {
 				panic(err)
 			}
 
-			fmt.Printf("Provider Address: %s\n", wallet.AccAddress())
+			log.Info().Msg(fmt.Sprintf("Provider Address: %s", wallet.AccAddress()))
 		},
 	}
 }

config/wallet.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	sequoiaWallet "github.com/JackalLabs/sequoia/wallet"
 	"github.com/desmos-labs/cosmos-go-wallet/wallet"
+	"github.com/rs/zerolog/log"
 	"os"
 	"path"
 )
@@ -55,7 +56,7 @@ func createWallet(directory string) error {
 	filePath := path.Join(directory, SeedFileName)
 
 	if newWallet {
-		fmt.Printf("A new wallet was just created, please enter your seed phrase into %s to start!\n", filePath)
+		log.Info().Msg(fmt.Sprintf("A new wallet was just created, please enter your seed phrase into %s to start!", filePath))
 		os.Exit(0)
 	}
 

core/app.go

@@ -12,9 +12,11 @@ import (
 	"github.com/desmos-labs/cosmos-go-wallet/wallet"
 	"github.com/dgraph-io/badger/v4"
 	storageTypes "github.com/jackalLabs/canine-chain/v3/x/storage/types"
+	"github.com/rs/zerolog/log"
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 )
 
 type App struct {
@@ -56,7 +58,7 @@ func initProviderOnChain(wallet *wallet.Wallet, ip string, totalSpace int64) err
 		return err
 	}
 
-	fmt.Println(res.TxHash)
+	log.Info().Msg(res.TxHash)
 
 	return nil
 }
@@ -83,7 +85,7 @@ func (a *App) Start() {
 
 	res, err := cl.Providers(context.Background(), queryParams)
 	if err != nil {
-		fmt.Println("Provider does not exist on network or is not connected...")
+		log.Info().Msg("Provider does not exist on network or is not connected...")
 		err := initProviderOnChain(w, cfg.Ip, cfg.TotalSpace)
 		if err != nil {
 			panic(err)
@@ -92,7 +94,7 @@ func (a *App) Start() {
 
 	myUrl := res.Providers.Ip
 
-	fmt.Printf("Provider started as: %s\n", myAddress)
+	log.Info().Msg(fmt.Sprintf("Provider started as: %s", myAddress))
 
 	a.q = queue.NewQueue(w, cfg.QueueInterval)
 	a.prover = proofs.NewProver(w, a.db, a.q, cfg.ProofInterval)
@@ -107,11 +109,13 @@ func (a *App) Start() {
 
 	done := make(chan os.Signal, 1)
 	signal.Notify(done, syscall.SIGINT, syscall.SIGTERM)
-	fmt.Println("Press ctrl+c to quit...")
 	<-done // Will block here until user hits ctrl+c
 
-	a.db.Close()
 	a.q.Stop()
 	a.prover.Stop()
 	a.strayManager.Stop()
+
+	time.Sleep(time.Second * 10) // give the program some time to shut down
+	a.db.Close()
+
 }

file_system/file_system.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"github.com/JackalLabs/sequoia/utils"
 	"github.com/dgraph-io/badger/v4"
+	"github.com/rs/zerolog/log"
 	"github.com/wealdtech/go-merkletree"
 	"github.com/wealdtech/go-merkletree/sha3"
 	"io"
@@ -79,19 +80,19 @@ func WriteFile(db *badger.DB, reader io.Reader, signee string, address string, c
 
 		err = txn.Set(treeKey(cid), exportedTree)
 		if err != nil {
-			fmt.Printf("Cannot set tree %s | %e\n", cid, err)
+			log.Info().Msg(fmt.Sprintf("Cannot set tree %s | %e", cid, err))
 		}
 
 		for i, chunk := range chunks {
 			err := txn.Set(chunkKey(cid, i), chunk)
 			if err != nil {
-				fmt.Printf("Cannot set chunk %d | %e", i, err)
+				log.Info().Msg(fmt.Sprintf("Cannot set chunk %d | %e", i, err))
 			}
 		}
 
 		err = txn.Set(fileKey(cid), []byte(fid))
 		if err != nil {
-			fmt.Printf("Cannot set cid %s | %e\n", cid, err)
+			log.Info().Msg(fmt.Sprintf("Cannot set cid %s | %e", cid, err))
 		}
 
 		merkle = r
@@ -104,7 +105,7 @@ func WriteFile(db *badger.DB, reader io.Reader, signee string, address string, c
 }
 
 func DeleteFile(db *badger.DB, cid string) error {
-	fmt.Printf("Removing %s from disk...\n", cid)
+	log.Info().Msg(fmt.Sprintf("Removing %s from disk...", cid))
 	return db.Update(func(txn *badger.Txn) error {
 
 		err := txn.Delete(treeKey(cid))

file_system/file_system_test.go

@@ -6,7 +6,9 @@ import (
 	"encoding/hex"
 	"fmt"
 	"github.com/dgraph-io/badger/v4"
+	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/require"
+	"strings"
 	"testing"
 )
 
@@ -45,7 +47,7 @@ func TestWriteFile(t *testing.T) {
 		for it.Rewind(); it.Valid(); it.Next() {
 			item := it.Item()
 			k := item.Key()
-			fmt.Printf("key=%s\n", k)
+			log.Info().Msg(fmt.Sprintf("key=%s", k))
 		}
 		return nil
 	})
@@ -54,7 +56,7 @@ func TestWriteFile(t *testing.T) {
 	s, err := ListFiles(db)
 	require.NoError(t, err)
 
-	fmt.Println(s)
+	log.Info().Msg(strings.Join(s, ","))
 
 }
 
@@ -96,7 +98,7 @@ func TestFIDCID(t *testing.T) {
 
 	require.Equal(t, fileData, fileDataFromFid)
 
-	fmt.Println(s)
+	log.Info().Msg(strings.Join(s, ","))
 
 }
 
@@ -111,7 +113,6 @@ func TestLargeFile(t *testing.T) {
 	defer db.Close()
 
 	for i := 1; i < 1024*20; i++ {
-		fmt.Printf("random size of %d\n", i)
 		bi := make([]byte, i)
 		// then we can call rand.Read.
 		_, err = rand.Read(bi)
@@ -127,7 +128,7 @@ func TestLargeFile(t *testing.T) {
 		fileData, err := GetFileData(db, cid)
 		require.NoError(t, err)
 
-		require.Equal(t, fmt.Sprintf("%x\n", bi), fmt.Sprintf("%x\n", fileData))
+		require.Equal(t, bi, fileData)
 
 	}