opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use shorten messaging API

Browse Source 
Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>
This commit is contained in:
dusanb94
2020-10-14 10:41:46 +02:00
parent 3c794d4a03
commit 4da66aecbf
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coap/api/transport.go
+1 -1
View File
@@ -31,7 +31,7 @@ const (
authQuery = "auth"
)
var channelPartRegExp = regexp.MustCompile(`^channels/([\w\-]+)/messages(/[^?]*)?(\?.*)?$`)
var channelPartRegExp = regexp.MustCompile(`^ch/([\w\-]+)/msg(/[^?]*)?(\?.*)?$`)
var errMalformedSubtopic = errors.New("malformed subtopic")
http/api/transport.go
+3 -3
View File
@@ -34,7 +34,7 @@ var (
errMalformedSubtopic = errors.New("malformed subtopic")
)
var channelPartRegExp = regexp.MustCompile(`^/channels/([\w\-]+)/messages(/[^?]*)?(\?.*)?$`)
var channelPartRegExp = regexp.MustCompile(`^/ch/([\w\-]+)/msg(/[^?]*)?(\?.*)?$`)
// MakeHandler returns a HTTP handler for API endpoints.
func MakeHandler(svc adapter.Service, tracer opentracing.Tracer) http.Handler {
@@ -43,14 +43,14 @@ func MakeHandler(svc adapter.Service, tracer opentracing.Tracer) http.Handler {
}
r := bone.New()
r.Post("/channels/:id/messages", kithttp.NewServer(
r.Post("/ch/:id/msg", kithttp.NewServer(
kitot.TraceServer(tracer, "publish")(sendMessageEndpoint(svc)),
decodeRequest,
encodeResponse,
opts...,
))
r.Post("/channels/:id/messages/*", kithttp.NewServer(
r.Post("/ch/:id/msg/*", kithttp.NewServer(
kitot.TraceServer(tracer, "publish")(sendMessageEndpoint(svc)),
decodeRequest,
encodeResponse,
mqtt/forwarder.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
)
const (
channels = "channels"
messages = "messages"
channels = "ch"
messages = "msg"
)
// Forwarder specifies MQTT forwarder interface API.
mqtt/handler.go
+1 -1
View File
@@ -22,7 +22,7 @@ var _ session.Handler = (*handler)(nil)
const protocol = "mqtt"
var (
channelRegExp = regexp.MustCompile(`^\/?channels\/([\w\-]+)\/messages(\/[^?]*)?(\?.*)?$`)
channelRegExp = regexp.MustCompile(`^\/?ch\/([\w\-]+)\/msg(\/[^?]*)?(\?.*)?$`)
errMalformedTopic = errors.New("malformed topic")
errMalformedData = errors.New("malformed request data")
errMalformedSubtopic = errors.New("malformed subtopic")