diff options
-rw-r--r-- | cleaner.go | 12 | ||||
-rw-r--r-- | sqlQueries.go | 12 |
2 files changed, 12 insertions, 12 deletions
@@ -51,13 +51,11 @@ func cleanData(conf Config, db_user, db_pass, db_conn, db_name string) (rowsLeft } //save cleaned data - for ix := range cDat { - err = insertCleanData(tx, &cDat[ix]) - if err != nil { - tx.Rollback() - log.Println("Failed to save cleaned data") - return - } + err = insertCleanData(tx, cDat) + if err != nil { + tx.Rollback() + log.Println("Failed to save cleaned data") + return } //remove old data diff --git a/sqlQueries.go b/sqlQueries.go index 6ed02c8..542acfa 100644 --- a/sqlQueries.go +++ b/sqlQueries.go @@ -116,17 +116,19 @@ func purgeRawData(tx *sql.Tx, rDat []rawData) (err error) { return } -func insertCleanData(tx *sql.Tx, cd *cleanedData) error { +func insertCleanData(tx *sql.Tx, cd []cleanedData) error { prepStmt, err := tx.Prepare("INSERT INTO clean_data (ipb_src, ipb_dst, as_src, as_dst, port_src, port_dst, occurences, volume, time_added) VALUES ( ? , ? , ? , ? , ? , ? , ? , ? , ? ) ON DUPLICATE KEY UPDATE occurences = occurences + ?") if err != nil { log.Println("Failed to prepare statement") return err } - _, err = prepStmt.Exec(cd.ipbSrc, cd.ipbDst, cd.asSrc, cd.asDst, cd.portSrc, cd.portDst, cd.occurences, cd.volume, cd.time, cd.occurences) - if err != nil { - log.Println("Failed to execute statement") - return err + for ix := range cd { + _, err = prepStmt.Exec(cd[ix].ipbSrc, cd[ix].ipbDst, cd[ix].asSrc, cd[ix].asDst, cd[ix].portSrc, cd[ix].portDst, cd[ix].occurences, cd[ix].volume, cd[ix].time, cd[ix].occurences) + if err != nil { + log.Println("Failed to execute statement") + return err + } } return nil |