storage: fix compile errors

zperf · Sep 6, 2023 · 23572d0 · 23572d0
1 parent 9cbf70c
commit 23572d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/tcpmon/cmd_ss.go b/tcpmon/cmd_ss.go
@@ -342,7 +342,6 @@ func (m *SocketMonitor) RunSS(now time.Time) (*TcpMetric, string, error) {
 		var t TcpMetric
 		t.Timestamp = now.Unix()
 		t.Type = MetricType_TCP
-		out := ss_outp
 		ParseSSOutput(&t, st.Stdout)
 		return &t, strings.Join(st.Stdout, "\n"), nil
 	}

diff --git a/tcpmon/storage.go b/tcpmon/storage.go
@@ -16,9 +16,9 @@ import (
 )
 
 type DataStore struct {
-	db     *badger.DB
-	tx     chan *KVPair
-	config DataStoreConfig
+	db       *badger.DB
+	tx       chan *KVPair
+	config   DataStoreConfig
 	lastOpen time.Time
 
 	done       chan struct{}
@@ -112,7 +112,7 @@ func (d *DataStore) writer(initialEpoch uint64, writeInterval time.Duration) {
 	d.openDatabase()
 	d.waitDbInit.Done()
 
-	err := d.db.Update(func(txn *badger.Txn) error {
+	err = d.db.Update(func(txn *badger.Txn) error {
 		err := txnEnsureExistsUint32(txn, KeyTotalCount)
 		if err != nil {
 			return err
@@ -317,16 +317,19 @@ func (d *DataStore) openDatabase() {
 }
 
 func (d *DataStore) reopenDatabase() {
+	d.closeDatabase()
+	d.openDatabase()
+}
+
+func (d *DataStore) closeDatabase() {
 	if d.db != nil {
 		err := d.db.Close()
 		if err != nil {
 			log.Warn().Err(err).Msg("Close db failed")
 		}
 		d.db = nil
 	}
-
 	debug.FreeOSMemory()
-	d.openDatabase()
 }
 
 func txnSetUint32(txn *badger.Txn, key string, value uint32) error {