|
@@ -190,7 +190,11 @@ func (importer *Importer) Import() (totalfilescount, totalrecordscount int64, to
|
|
|
})
|
|
|
wg.Wait()
|
|
|
if e != nil {
|
|
|
- err = e
|
|
|
+ if os.IsNotExist(e) {
|
|
|
+ err = merrs.NewError(`directory "`+importer.datapath+`" not exist specified by "datapath"`, e)
|
|
|
+ } else {
|
|
|
+ err = merrs.NewError(e)
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
cgistatus.WaitSaveDone()
|
|
@@ -310,7 +314,6 @@ func Check() {
|
|
|
return
|
|
|
}
|
|
|
{
|
|
|
- time.Sleep(3 * time.Second)
|
|
|
mql := "select * from /m3cnet/master"
|
|
|
r, e := client.Query(mql).Do()
|
|
|
if e != nil {
|
|
@@ -319,13 +322,4 @@ func Check() {
|
|
|
bs, _ := json.MarshalIndent(r.Data, "", " ")
|
|
|
fmt.Println(string(bs))
|
|
|
}
|
|
|
- // {
|
|
|
- // mql := "select * from /m3cnet/minfo/level1"
|
|
|
- // r, e := client.Query(mql).Do()
|
|
|
- // if e != nil {
|
|
|
- // panic(merrs.NewError(e))
|
|
|
- // }
|
|
|
- // bs, _ := json.MarshalIndent(r.Data, "", " ")
|
|
|
- // fmt.Println(string(bs))
|
|
|
- // }
|
|
|
}
|