adjust logging format

ENVDB.matest

@@ -1,11 +0,0 @@
-N=homea
-
-PGHOST=`kubectl get services traefik -n system -o jsonpath="{.status.loadBalancer.ingress[0].ip}"`
-PGPASSWORD=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGPASSWORD}" | base64 --decode`
-PGUSER=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGUSER}" | base64 --decode`
-PGSSLMODE=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGSSLMODE}" | base64 --decode`
-PGDATABASE="matest"
-export PGUSER PGHOST PGPASSWORD PGSSLMODE PGDATABASE
-
-MA_CONF=`cat config-test.json`
-export MA_CONF

deployment/config.json

@@ -8,10 +8,7 @@
     "#"
   ],
   "excludeTopics": [
-    "IoT/Watchdog",
-    "snmp",
-    "MainsCnt/#",
-    "cem/#"
+    "IoT/Watchdog"
   ],
   "syslog": {
     "enable": "true",

deployment/deploy-yml.tmpl

@@ -4,8 +4,6 @@ metadata:
   name: ma
   labels:
     app: ma
-  annotations:
-    secret.reloader.stakater.com/reload: ma-db-cred
 spec:
   replicas: 1
   selector:
@@ -21,8 +19,6 @@ spec:
           image: %IMAGE%
           imagePullPolicy: Always
           envFrom:
-            - secretRef: 
-                name: ma-db-cred
             - secretRef: 
                 name: ma-mqtt-cred
             - configMapRef:

deployment/roll-credentials.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. ~/Workspace/mykubernetesenv/ENVDB1
-
-DATABASE=ma
-LOGIN=ma
-PASSWORD=`openssl rand -base64 24`
-NAMESPACE=`cat namespace`
-
-
-psql <<EOF
-do
-\$\$
-begin
-  ALTER USER $LOGIN WITH PASSWORD '$PASSWORD';
-  GRANT ALL PRIVILEGES ON DATABASE $DATABASE TO $LOGIN;
-end
-\$\$
-;
-commit;
-EOF
-
-
-
-kubectl create secret generic ma-db-cred \
-  --dry-run=client \
-  -o yaml \
-  --save-config \
-  --from-literal=PGUSER="$LOGIN" \
-  --from-literal=PGPASSWORD="$PASSWORD" \
-  --from-literal=PGDATABASE="$DATABASE" \
-  --from-literal=PGHOST="database.database1.svc.cluster.local" \
-  --from-literal=PGSSLMODE="require" | \
-  kubectl apply -f - -n $NAMESPACE
-

src/ma/archiver/archiver.go

@@ -1,6 +1,7 @@
 package archiver
 
 import (
+	"fmt"
 	"log"
 	"ma/mqtt"
 	"time"
@@ -27,5 +28,5 @@ func InputArchiver() {
 func handleMessage(message Message) {
 	log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
 
-	WriteSyslog(message)
+	WriteSyslog(fmt.Sprintf("| TS: %s | TOPIC: %s | PAYLOAD: %s |", message.Time.String(), message.Topic, message.Payload))
 }

src/ma/archiver/syslog.go

@@ -1,7 +1,6 @@
 package archiver
 
 import (
-	"encoding/json"
 	"log"
 	"log/syslog"
 	"ma/config"
@@ -36,34 +35,28 @@ func InitSyslog() {
 	}
 }
 
-func WriteSyslog(message Message) {
+func WriteSyslog(message string) {
 	if syslogWriter != nil {
-		jsonData, err := json.Marshal(message)
-		if err != nil {
-			log.Printf("Failed to marshal message to JSON: %v", err)
-			return
-		}
-
 		// Send to syslog based on configured severity
 		switch config.Config.Syslog.Severity {
 		case "emerg":
-			syslogWriter.Emerg(string(jsonData))
+			syslogWriter.Emerg(message)
 		case "alert":
-			syslogWriter.Alert(string(jsonData))
+			syslogWriter.Alert(message)
 		case "crit":
-			syslogWriter.Crit(string(jsonData))
+			syslogWriter.Crit(message)
 		case "err":
-			syslogWriter.Err(string(jsonData))
+			syslogWriter.Err(message)
 		case "warning":
-			syslogWriter.Warning(string(jsonData))
+			syslogWriter.Warning(message)
 		case "notice":
-			syslogWriter.Notice(string(jsonData))
+			syslogWriter.Notice(message)
 		case "info":
-			syslogWriter.Info(string(jsonData))
+			syslogWriter.Info(message)
 		case "debug":
-			syslogWriter.Debug(string(jsonData))
+			syslogWriter.Debug(message)
 		default:
-			syslogWriter.Info(string(jsonData))
+			syslogWriter.Info(message)
 		}
 	}
 }

src/ma/migrate_schema.go

@@ -1,18 +0,0 @@
-package main
-
-import "log"
-import "ma/database"
-
-
-
-func main() {
-  log.SetPrefix("UDI Migrate Schema: ")
-  log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
-
-  log.Println("Starting")
-
-  database.Migrate()
-
-  log.Println("Done")
-}
-