pkg reorg

cmd/recv/main.go

@@ -1,14 +1,14 @@
 package main
 
 import (
+	"go.digitalcircle.com.br/open/simplemq/lib/smqcli"
+	"go.digitalcircle.com.br/open/simplemq/lib/types"
 	"log"
-	"simplemq/lib/client"
-	"simplemq/lib/types"
 	"time"
 )
 
 func main() {
-	c, err := client.New("ws://localhost:8080/ws")
+	c, err := smqcli.New("ws://localhost:8080/ws")
 	if err != nil {
 		panic(err.Error())
 	}

cmd/rpccli/main.go

@@ -2,16 +2,16 @@ package main
 
 import (
 	"fmt"
+	"go.digitalcircle.com.br/open/simplemq/lib/smqcli"
+	"go.digitalcircle.com.br/open/simplemq/lib/types"
 	"log"
 	"runtime"
-	"simplemq/lib/client"
-	"simplemq/lib/types"
 	"time"
 )
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	c, err := client.New("ws://localhost:8080/ws")
+	c, err := smqcli.New("ws://localhost:8080/ws")
 	if err != nil {
 		panic(err.Error())
 	}

cmd/rpcserver/main.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"fmt"
+	"go.digitalcircle.com.br/open/simplemq/lib/smqcli"
+	"go.digitalcircle.com.br/open/simplemq/lib/types"
 	"log"
-	"simplemq/lib/client"
-	"simplemq/lib/types"
 	"time"
 )
 
 func main() {
-	c, err := client.New("ws://localhost:8080/ws")
+	c, err := smqcli.New("ws://localhost:8080/ws")
 	if err != nil {
 		panic(err.Error())
 	}

cmd/send/main.go

@@ -1,13 +1,13 @@
 package main
 
 import (
+	"go.digitalcircle.com.br/open/simplemq/lib/smqcli"
 	"log"
-	"simplemq/lib/client"
 	"time"
 )
 
 func main() {
-	c, err := client.New("ws://localhost:8080/ws")
+	c, err := smqcli.New("ws://localhost:8080/ws")
 	if err != nil {
 		panic(err.Error())
 	}

cmd/server/main.go

@@ -1,13 +1,13 @@
 package main
 
 import (
+	"go.digitalcircle.com.br/open/simplemq/lib/smqsvr"
 	"net/http"
-	"simplemq/lib/server"
 )
 
 func main() {
-	http.HandleFunc("/ws", server.Serve)
+	http.HandleFunc("/ws", smqsvr.Serve)
-	http.HandleFunc("/stats", server.Stats)
+	http.HandleFunc("/stats", smqsvr.Stats)
 	err := http.ListenAndServe(":8080", nil)
 	if err != nil {
 		panic(err)

smqcli/lib.go

@@ -1,13 +1,13 @@
-package client
+package smqcli
 
 import (
 	"errors"
 	"fmt"
 	"github.com/gorilla/websocket"
+	"go.digitalcircle.com.br/open/simplemq/lib/random"
+	"go.digitalcircle.com.br/open/simplemq/lib/types"
 	"log"
 	"regexp"
-	"simplemq/lib/random"
-	"simplemq/lib/types"
 	"sync"
 	"time"
 )

smqsvr/lib.go

@@ -1,15 +1,15 @@
-package server
+package smqsvr
 
 import (
 	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/gorilla/websocket"
+	"go.digitalcircle.com.br/open/simplemq/lib/random"
+	"go.digitalcircle.com.br/open/simplemq/lib/types"
 	"log"
 	"net/http"
 	"regexp"
-	"simplemq/lib/random"
-	"simplemq/lib/types"
 	"strings"
 	"sync"
 	"time"