From df2b721546dcf54684b0d830b978ad8a4825de53 Mon Sep 17 00:00:00 2001
From: sadayuki-matsuno <sadayuki.matsuno@gmail.com>
Date: Thu, 4 Jul 2024 16:00:14 +0900
Subject: [PATCH] feat(db) no progress when --log-json option (#405)

---
 db/rdb.go   | 15 +++++++++++++--
 db/redis.go |  9 ++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/db/rdb.go b/db/rdb.go
index 8e7156c4..3d47f7ad 100644
--- a/db/rdb.go
+++ b/db/rdb.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"time"
@@ -325,7 +326,12 @@ func (r *RDBDriver) InsertOval(root *models.Root) error {
 			return xerrors.Errorf("Failed to select old defs: %w", err)
 		}
 
-		bar := pb.StartNew(len(defs))
+		bar := pb.StartNew(len(defs)).SetWriter(func() io.Writer {
+			if viper.GetBool("log-json") {
+				return io.Discard
+			}
+			return os.Stderr
+		}())
 		for idx := range chunkSlice(len(defs), 998) {
 			var advs []models.Advisory
 			if err := tx.Model(defs[idx.From:idx.To]).Association("Advisory").Find(&advs); err != nil {
@@ -354,7 +360,12 @@ func (r *RDBDriver) InsertOval(root *models.Root) error {
 	}
 
 	log15.Info("Inserting new Definitions...")
-	bar := pb.StartNew(len(root.Definitions))
+	bar := pb.StartNew(len(root.Definitions)).SetWriter(func() io.Writer {
+		if viper.GetBool("log-json") {
+			return io.Discard
+		}
+		return os.Stderr
+	}())
 	if err := tx.Omit("Definitions").Create(&root).Error; err != nil {
 		tx.Rollback()
 		return xerrors.Errorf("Failed to insert Root. err: %w", err)
diff --git a/db/redis.go b/db/redis.go
index 9ece4d8f..e17b94f2 100644
--- a/db/redis.go
+++ b/db/redis.go
@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -338,7 +340,12 @@ func (r *RedisDriver) InsertOval(root *models.Root) (err error) {
 		return xerrors.Errorf("Failed to unmarshal JSON. err: %w", err)
 	}
 
-	bar := pb.StartNew(len(root.Definitions))
+	bar := pb.StartNew(len(root.Definitions)).SetWriter(func() io.Writer {
+		if viper.GetBool("log-json") {
+			return io.Discard
+		}
+		return os.Stderr
+	}())
 	for idx := range chunkSlice(len(root.Definitions), batchSize) {
 		pipe := r.conn.Pipeline()
 		for _, def := range root.Definitions[idx.From:idx.To] {