chore: misc changes (#88)

Author: medcl

.gitignore

@@ -55,3 +55,4 @@ config/generat*.go
 generated_*.go
 *.swp
 .latest_commit_hash.txt
+/plugins/enterprise/

modules/elastic/orm.go

@@ -72,7 +72,7 @@ func InitTemplate(force bool) {
 					skip = exists
 				}
 
-				log.Trace(skip,",",k,",",v)
+				log.Trace(skip, ",", k, ",", v)
 
 				if !skip {
 					v, err := client.PutTemplate(k, []byte(v))
@@ -98,15 +98,15 @@ func InitTemplate(force bool) {
 					skip = exists
 				}
 
-				log.Trace(skip,",",k,",",v)
+				log.Trace(skip, ",", k, ",", v)
 
 				if !skip {
-					script:=util.MapStr{}
-					script["script"]=util.MapStr{
-						"lang": "mustache",
+					script := util.MapStr{}
+					script["script"] = util.MapStr{
+						"lang":   "mustache",
 						"source": v,
 					}
-					v, err := client.PutScript(k,util.MustToJSONBytes(script) )
+					v, err := client.PutScript(k, util.MustToJSONBytes(script))
 					if err != nil {
 						if v != nil {
 							log.Error(string(v))
@@ -368,6 +368,10 @@ func (handler *ElasticORM) Search(t interface{}, q *api.Query) (error, api.Resul
 func (handler *ElasticORM) SearchWithResultItemMapper(resultArray interface{}, itemMapFunc func(source []byte, targetRef interface{}) error, q *api.Query) (error, api.SimpleResult) {
 	var err error
 
+	if q == nil {
+		panic("invalid query")
+	}
+
 	request := elastic.SearchRequest{
 		From: q.From,
 		Size: q.Size,

modules/queue/disk_queue/consumer.go

@@ -503,7 +503,7 @@ func (d *Consumer) ResetOffset(segment, readPos int64) error {
 			if d.mCfg.AutoSkipCorruptFile {
 				nextSegment := d.segment + 1
 				if nextSegment > d.diskQueue.writeSegmentNum {
-					return errors.New(fileName + " not found and next segment greater than current write segment ")
+					return errors.Errorf("%v not found and next segment(%v) greater than current write segment(%v)", fileName, nextSegment, d.diskQueue.writeSegmentNum)
 				}
 				log.Warnf("queue:%v,%v, consumer:%v, offset:%v,%v, file missing: %v, auto skip to next file",
 					d.qCfg.Name, d.queue, d.cCfg.Key(), d.segment, d.readPos, fileName)