|
@@ -212,7 +212,7 @@ func (importer *Importer) ImportFiles(fwop func(basedir string, fpath string) FW
|
|
importer.importstatus.TotalUseTime = time.Since(importer.starttime)
|
|
importer.importstatus.TotalUseTime = time.Since(importer.starttime)
|
|
importer.importstatus.mutex.Unlock()
|
|
importer.importstatus.mutex.Unlock()
|
|
importer.importstatus.Save()
|
|
importer.importstatus.Save()
|
|
- if totalretrycount > 0 {
|
|
|
|
|
|
+ if retries > 0 {
|
|
logger.Info("file", filename, "total imported", lines, "lines", records, "records", retries, "retry times")
|
|
logger.Info("file", filename, "total imported", lines, "lines", records, "records", retries, "retry times")
|
|
} else {
|
|
} else {
|
|
logger.Info("file", filename, "total imported", lines, "lines", records, "records")
|
|
logger.Info("file", filename, "total imported", lines, "lines", records, "records")
|
|
@@ -277,6 +277,7 @@ func (importer *Importer) importReader(filename string, buf io.Reader, linefrom,
|
|
skiplines := int(linefrom)
|
|
skiplines := int(linefrom)
|
|
blockcount = blockfrom
|
|
blockcount = blockfrom
|
|
doinglines := []int64{}
|
|
doinglines := []int64{}
|
|
|
|
+ retrycount = totalretrycount
|
|
var wg sync.WaitGroup
|
|
var wg sync.WaitGroup
|
|
defer importer.done()
|
|
defer importer.done()
|
|
defer wg.Wait()
|
|
defer wg.Wait()
|