8 Commits

Author SHA1 Message Date
090f2017f2 debug app connection, 2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 16:09:23 +01:00
d9d43b3566 debug app connection, 1
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/tag/woodpecker Pipeline failed
2024-01-14 16:06:04 +01:00
308ca8caab debug app connection
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 16:02:12 +01:00
1b3429184a ingress 4
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 15:32:13 +01:00
a7262d99cc ingress 3
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 15:28:30 +01:00
6be68d4dee ingress
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 15:18:07 +01:00
54eeb17e9b ingress
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 15:16:45 +01:00
4a56fea33b timestamp added
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-01-14 15:09:41 +01:00
3 changed files with 48 additions and 5 deletions

View File

@ -26,7 +26,45 @@ spec:
value: mqtt://emqx01-anonymous-cluster-internal.broker.svc.cluster.local:1883
- name: MQTT_TOPIC
value: locative/event
- name: GIN_MODE
value: release
ports:
- containerPort: 8080
protocol: TCP
---
apiVersion: v1
kind: Service
metadata:
name: locative
spec:
type: ClusterIP
selector:
app: locsrv
ports:
- name: http
targetPort: 8080
port: 80
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: locative
annotations:
cert-manager.io/cluster-issuer: letsencrypt-production-http
spec:
tls:
- hosts:
- locative.hottis.de
secretName: locative-cert
rules:
- host: locative.hottis.de
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: locative
port:
number: 80

View File

@ -2,6 +2,7 @@ package main
import (
"log"
"time"
"github.com/gin-gonic/gin"
"net/http"
"encoding/json"
@ -30,6 +31,7 @@ type locativeEvent struct {
Latitude string `json:"latitude"`
Longitude string `json:"longitude"`
Person string `json:"person"`
Timestamp string `json:"timestamp"`
}
@ -46,6 +48,7 @@ func main() {
person, err := dbh.GetPersonById(event.Device)
event.Person = person
event.Location = event.Id
event.Timestamp = time.Now().Format("2006-01-02 15:04:05 MST")
event.Id = ""
if err != nil {
log.Printf("Person unknown: %v", err)
@ -65,11 +68,13 @@ func main() {
}()
router.POST("/location", func(c *gin.Context) {
var body locativeEvent
data, err := c.GetRawData()
log.Printf("raw: %v, %s", err, string(data))
err := c.ShouldBindJSON(&body)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H { "error": err.Error() })
var body locativeEvent
err1 := c.ShouldBindJSON(&body)
if err1 != nil {
c.JSON(http.StatusBadRequest, gin.H { "error": err1.Error() })
return
}

View File

@ -45,7 +45,7 @@ func (self *MqttHandle) Publish(topicPost string, message string) error {
}
topic := fmt.Sprintf("%s/%s", self.pubTopic, topicPost)
token := self.client.Publish(topic, 0, false, message)
token := self.client.Publish(topic, 0, true, message)
token.Wait()
if token.Error() != nil {
return fmt.Errorf("MQTT publish failed: %v", token.Error())