update cli to gen tmp file (#7)

0glabs · Apr 7, 2024 · 106fa4e · 106fa4e
1 parent a5055ab
commit 106fa4e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/cmd/generate_file.go b/cmd/generate_file.go
@@ -25,9 +25,9 @@ var (
 )
 
 func init() {
-	genFileCmd.Flags().Uint64Var(&genFileArgs.size, "size", 0, "File size in bytes")
+	genFileCmd.Flags().Uint64Var(&genFileArgs.size, "size", 0, "File size in bytes (default \"[1M, 10M)\")")
 	genFileCmd.Flags().StringVar(&genFileArgs.file, "file", "tmp123456", "File name to generate")
-	genFileCmd.Flags().BoolVar(&genFileArgs.overwrite, "overwrite", true, "Whether to overwrite existing file")
+	genFileCmd.Flags().BoolVar(&genFileArgs.overwrite, "overwrite", false, "Whether to overwrite existing file")
 
 	rootCmd.AddCommand(genFileCmd)
 }
@@ -40,11 +40,11 @@ func generateTempFile(*cobra.Command, []string) {
 
 	if exists {
 		if !genFileArgs.overwrite {
-			logrus.Warn("File already exists")
+			logrus.WithField("file", genFileArgs.file).Warn("File already exists")
 			return
 		}
 
-		logrus.Info("Overrite file")
+		logrus.WithField("file", genFileArgs.file).Info("Overrite file")
 	}
 
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
@@ -61,7 +61,7 @@ func generateTempFile(*cobra.Command, []string) {
 		logrus.WithField("n", n).Fatal("Invalid data len")
 	}
 
-	if err = os.WriteFile(genFileArgs.file, data, os.ModePerm); err != nil {
+	if err := os.WriteFile(genFileArgs.file, data, os.ModePerm); err != nil {
 		logrus.WithError(err).Fatal("Failed to write file")
 	}
 
@@ -75,5 +75,5 @@ func generateTempFile(*cobra.Command, []string) {
 		logrus.WithError(err).Fatal("Failed to generate merkle tree")
 	}
 
-	logrus.WithField("root", tree.Root()).Info("Succeeded to write file")
+	logrus.WithField("root", tree.Root()).WithField("file", genFileArgs.file).Info("Succeeded to write file")
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -10,8 +10,8 @@ import (
 )
 
 var (
-	logLevel       string
-	logColorForced bool
+	logLevel         string
+	logColorDisabled bool
 
 	rootCmd = &cobra.Command{
 		Use:   "0g-storage-client",
@@ -27,20 +27,25 @@ var (
 
 func init() {
 	rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", logrus.InfoLevel.String(), "Log level")
-	rootCmd.PersistentFlags().BoolVar(&logColorForced, "log-force-color", false, "Force to output colorful logs")
+	rootCmd.PersistentFlags().BoolVar(&logColorDisabled, "log-color-disabled", false, "Force to disable colorful logs")
 	rootCmd.PersistentFlags().Uint64Var(&blockchain.CustomGasPrice, "gas-price", 0, "Custom gas price to send transaction")
 	rootCmd.PersistentFlags().Uint64Var(&blockchain.CustomGasLimit, "gas-limit", 0, "Custom gas limit to send transaction")
 	rootCmd.PersistentFlags().BoolVar(&blockchain.Web3LogEnabled, "web3-log-enabled", false, "Enable log for web3 RPC")
 }
 
 func initLog() {
-	if logColorForced {
-		logrus.SetFormatter(&logrus.TextFormatter{
-			ForceColors:   true,
-			FullTimestamp: true,
-		})
+	formatter := logrus.TextFormatter{
+		FullTimestamp: true,
 	}
 
+	if logColorDisabled {
+		formatter.DisableColors = true
+	} else {
+		formatter.ForceColors = true
+	}
+
+	logrus.SetFormatter(&formatter)
+
 	level, err := logrus.ParseLevel(logLevel)
 	if err != nil {
 		logrus.WithError(err).WithField("level", logLevel).Fatal("Failed to parse log level")