nats migration

api/cli.go

@@ -1,15 +1,10 @@
 package api
 
 import (
-	"encoding/json"
-	"errors"
-	"github.com/nats-io/nats.go"
 	"go.digitalcircle.com.br/open/httpcli"
 	"go.digitalcircle.com.br/open/replaycli-go/ipcmux"
 	"go.digitalcircle.com.br/open/replaycli-go/util"
-	"log"
 	"os"
-	"time"
 )
 
 type ApiCli struct {
@@ -35,48 +30,3 @@ func NewApiIPCCli() *ApiCli {
 	ret.cli.AddHeader("X-API-KEY", apikey)
 	return ret
 }
-
-var nc *nats.Conn
-
-func Call(s string, in interface{}, out interface{}) error {
-	if nc == nil {
-		var err error
-		apikey = os.Getenv("REPLAY_APIKEY")
-		if apikey == "" {
-			log.Printf("Connecting to NATS Server w/o TK.")
-			nc, err = nats.Connect(nats.DefaultURL)
-		} else {
-			log.Printf("Connecting to NATS Server w TK: " + apikey)
-			nc, err = nats.Connect(nats.DefaultURL, nats.Token(apikey))
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	bs, err := json.Marshal(in)
-	if err != nil {
-		return err
-	}
-
-	msg, err := nc.Request(s, bs, time.Minute)
-	if err != nil {
-		return err
-	}
-
-	err = json.Unmarshal(msg.Data, out)
-	if err != nil {
-		out = bs
-		return err
-	}
-
-	errstr := msg.Header.Get("ERR")
-	if errstr != "" {
-		return errors.New(errstr)
-	}
-
-	return nil
-}
-func Close() error {
-	return nc.Drain()
-}

api/nats.go

@@ -0,0 +1,110 @@
+package api
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/nats-io/nats.go"
+	"log"
+	"os"
+	"time"
+)
+
+var nc *nats.Conn
+
+type CallOpts struct {
+	To int
+}
+
+func Call(s string, in interface{}, out interface{}, opts ...*CallOpts) error {
+	var err error
+	opt := &CallOpts{}
+	if opts != nil && len(opts) > 1 {
+		opt = opts[0]
+	}
+	if opt.To == 0 {
+		opt.To = 60
+	}
+	defer func() {
+		if nc != nil && err != nil {
+			err1 := nc.Publish("err", []byte(fmt.Sprintf("Error calling nats: %s: \nIN: %v\nOUT: %v", s, err.Error(), in, out)))
+			if err1 != nil {
+				log.Printf("Error calling nats: %s: \nIN: %v\nOUT: %v", s, err.Error(), in, out)
+				log.Printf("Inner error: %s", err1.Error())
+			}
+		} else if nc == nil && err != nil {
+			log.Printf("Error calling nats: %s: \nIN: %v\nOUT: %v\n(nc is nil)", s, err.Error(), in, out)
+		}
+
+	}()
+	if nc == nil {
+
+		apikey = os.Getenv("REPLAY_APIKEY")
+		if apikey == "" {
+			log.Printf("Connecting to NATS Server w/o TK.")
+			nc, err = nats.Connect(nats.DefaultURL)
+		} else {
+			log.Printf("Connecting to NATS Server w TK: " + apikey)
+			nc, err = nats.Connect(nats.DefaultURL, nats.Token(apikey))
+		}
+		if err != nil {
+			return err
+		}
+	}
+	var bs []byte
+	if in != nil {
+		bs, err = json.Marshal(in)
+		if err != nil {
+			return err
+		}
+	} else {
+		bs = []byte("{}")
+	}
+
+	msg, err := nc.Request(s, bs, time.Second+time.Duration(opt.To))
+	if err != nil {
+		return err
+	}
+	if out != nil {
+		err = json.Unmarshal(msg.Data, out)
+		if err != nil {
+			out = bs
+			return err
+		}
+	}
+
+	errstr := msg.Header.Get("ERR")
+	if errstr != "" {
+		return errors.New(errstr)
+	}
+
+	return nil
+}
+func Close() error {
+	return nc.Drain()
+}
+func Pub(s string, in interface{}) error {
+	var err error
+	defer func() {
+		if nc != nil && err != nil {
+			err1 := nc.Publish("err", []byte(fmt.Sprintf("Error calling nats: %s: \nIN: %v", s, err.Error(), in)))
+			if err1 != nil {
+				log.Printf("Error calling nats: %s: \nIN: %v", s, err.Error(), in)
+				log.Printf("Inner error: %s", err1.Error())
+			}
+		} else if nc == nil && err != nil {
+			log.Printf("Error calling nats: %s: \nIN: %v\n(nc is nil)", s, err.Error(), in)
+		}
+
+	}()
+
+	bs, err := json.Marshal(in)
+	if err != nil {
+		return err
+	}
+
+	err = nc.Publish(s, bs)
+
+	return err
+
+}

api/ocr/cli.go

@@ -172,10 +172,10 @@ type Cli struct {
 	*api.ApiCli
 }
 
-func (c *Cli) OCR(opts *Opts) (*Alto, error) {
+func (c *Cli) OCR(opts *Opts, copts ...*api.CallOpts) (*Alto, error) {
 	res := &Alto{}
 	//err := c.HttpCli().JsonPost("/ipc/ocr/", opts, res)
-	err := api.Call("ocr.ocr", opts, &res)
+	err := api.Call("ocr.ocr", opts, &res, copts...)
 	return res, err
 }