logging cleanup

internal/module/http-client.go

@@ -44,7 +44,7 @@ func (hc *HTTPClient) Run() error {
 	}
 
 	<-hc.ctx.Done()
-	hc.logger.Debug("router context done in module")
+	hc.logger.Debug("done")
 	return nil
 }
 

internal/module/http-server.go

@@ -91,17 +91,19 @@ func (hs *HTTPServer) Run() error {
 
 	go func() {
 		<-hs.ctx.Done()
-		hs.logger.Debug("router context done in module")
 		httpServer.Close()
 	}()
 
 	err := httpServer.ListenAndServe()
 	// TODO(jwetzell): handle server closed error differently
 	if err != nil {
-		return err
+		if err.Error() != "http: Server closed" {
+			return err
+		}
 	}
 
 	<-hs.ctx.Done()
+	hs.logger.Debug("done")
 	return nil
 }
 

internal/module/interval.go

@@ -57,7 +57,7 @@ func (i *Interval) Run() error {
 	for {
 		select {
 		case <-i.ctx.Done():
-			i.logger.Debug("router context done in module")
+			i.logger.Debug("done")
 			return nil
 		case <-ticker.C:
 			if i.router != nil {

internal/module/midi-input.go

@@ -74,7 +74,7 @@ func (mi *MIDIInput) Run() error {
 	defer stop()
 
 	<-mi.ctx.Done()
-	mi.logger.Debug("router context done in module")
+	mi.logger.Debug("done")
 	return nil
 }
 

internal/module/midi-ouptut.go

@@ -71,7 +71,7 @@ func (mo *MIDIOutput) Run() error {
 	mo.SendFunc = send
 
 	<-mo.ctx.Done()
-	mo.logger.Debug("router context done in module")
+	mo.logger.Debug("done")
 	return nil
 }
 

internal/module/mqtt-client.go

@@ -3,7 +3,6 @@ package module
 import (
 	"context"
 	"errors"
-	"fmt"
 	"log/slog"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
@@ -101,15 +100,13 @@ func (mc *MQTTClient) Run() error {
 	}
 
 	<-mc.ctx.Done()
-	mc.logger.Debug("router context done in module")
+	mc.logger.Debug("done")
 	return nil
 }
 
 func (mc *MQTTClient) Output(payload any) error {
 	payloadMessage, ok := payload.(mqtt.Message)
 
-	fmt.Printf("payload type: %T\n", payload)
-
 	if !ok {
 		return errors.New("mqtt.client is only able to output a MQTTMessage")
 	}

internal/module/nats-client.go

@@ -88,7 +88,7 @@ func (nc *NATSClient) Run() error {
 	defer sub.Unsubscribe()
 
 	<-nc.ctx.Done()
-	nc.logger.Debug("router context done in module")
+	nc.logger.Debug("done")
 	return nil
 }
 

internal/module/psn-client.go

@@ -59,7 +59,7 @@ func (pc *PSNClient) Run() error {
 		select {
 		case <-pc.ctx.Done():
 			// TODO(jwetzell): cleanup?
-			pc.logger.Debug("router context done in module")
+			pc.logger.Debug("done")
 			return nil
 		default:
 			pc.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))

internal/module/serial-client.go

@@ -106,7 +106,7 @@ func (sc *SerialClient) Run() error {
 	// TODO(jwetzell): shutdown with router.Context properly
 	go func() {
 		<-sc.ctx.Done()
-		sc.logger.Debug("router context done in module")
+		sc.logger.Debug("done")
 		if sc.port != nil {
 			sc.port.Close()
 		}
@@ -116,10 +116,10 @@ func (sc *SerialClient) Run() error {
 		err := sc.SetupPort()
 		if err != nil {
 			if sc.ctx.Err() != nil {
-				sc.logger.Debug("router context done in module")
+				sc.logger.Debug("done")
 				return nil
 			}
-			sc.logger.Error("serial.client", "error", err.Error())
+			sc.logger.Error("port setup error", "error", err.Error())
 			time.Sleep(time.Second * 2)
 			continue
 		}
@@ -127,14 +127,14 @@ func (sc *SerialClient) Run() error {
 		buffer := make([]byte, 1024)
 		select {
 		case <-sc.ctx.Done():
-			sc.logger.Debug("router context done in module")
+			sc.logger.Debug("done")
 			return nil
 		default:
 		READ:
 			for {
 				select {
 				case <-sc.ctx.Done():
-					sc.logger.Debug("router context done in module")
+					sc.logger.Debug("done")
 					return nil
 				default:
 					byteCount, err := sc.port.Read(buffer)
@@ -151,7 +151,7 @@ func (sc *SerialClient) Run() error {
 								if sc.router != nil {
 									sc.router.HandleInput(sc.Id(), message)
 								} else {
-									sc.logger.Error("serial.client has no router")
+									sc.logger.Error("input received but no router is configured")
 								}
 							}
 						}

internal/module/sip-call-server.go

@@ -129,7 +129,7 @@ func (scs *SIPCallServer) Run() error {
 	scs.dg = dg
 
 	<-scs.ctx.Done()
-	scs.logger.Debug("router context done in module")
+	scs.logger.Debug("done")
 	return nil
 }
 

internal/module/sip-dtmf-server.go

@@ -132,7 +132,7 @@ func (sds *SIPDTMFServer) Run() error {
 	}
 
 	<-sds.ctx.Done()
-	sds.logger.Debug("router context done in module")
+	sds.logger.Debug("done")
 	return nil
 }
 

internal/module/tcp-client.go

@@ -93,7 +93,7 @@ func (tc *TCPClient) Run() error {
 	// TODO(jwetzell): shutdown with router.Context properly
 	go func() {
 		<-tc.ctx.Done()
-		tc.logger.Debug("router context done in module")
+		tc.logger.Debug("done")
 		if tc.conn != nil {
 			tc.conn.Close()
 		}
@@ -103,10 +103,10 @@ func (tc *TCPClient) Run() error {
 		err := tc.SetupConn()
 		if err != nil {
 			if tc.ctx.Err() != nil {
-				tc.logger.Debug("router context done in module")
+				tc.logger.Debug("done")
 				return nil
 			}
-			tc.logger.Error("net.tcp.client", "error", err.Error())
+			tc.logger.Error("connection error", "error", err.Error())
 			time.Sleep(time.Second * 2)
 			continue
 		}
@@ -114,14 +114,14 @@ func (tc *TCPClient) Run() error {
 		buffer := make([]byte, 1024)
 		select {
 		case <-tc.ctx.Done():
-			tc.logger.Debug("router context done in module")
+			tc.logger.Debug("done")
 			return nil
 		default:
 		READ:
 			for {
 				select {
 				case <-tc.ctx.Done():
-					tc.logger.Debug("router context done in module")
+					tc.logger.Debug("done")
 					return nil
 				default:
 					byteCount, err := tc.conn.Read(buffer)
@@ -138,7 +138,7 @@ func (tc *TCPClient) Run() error {
 								if tc.router != nil {
 									tc.router.HandleInput(tc.Id(), message)
 								} else {
-									tc.logger.Error("net.tcp.client has no router")
+									tc.logger.Error("input received but no router is configured")
 								}
 							}
 						}

internal/module/tcp-server.go

@@ -126,7 +126,7 @@ ClientRead:
 								break
 							}
 						}
-						ts.logger.Debug("net.tcp.server connection reset", "remoteAddr", client.RemoteAddr().String())
+						ts.logger.Debug("connection reset", "remoteAddr", client.RemoteAddr().String())
 						ts.connectionsMu.Unlock()
 					}
 				}
@@ -139,7 +139,7 @@ ClientRead:
 							break
 						}
 					}
-					ts.logger.Debug("net.tcp.server stream ended", "remoteAddr", client.RemoteAddr().String())
+					ts.logger.Debug("stream ended", "remoteAddr", client.RemoteAddr().String())
 					ts.connectionsMu.Unlock()
 				}
 				return
@@ -151,7 +151,7 @@ ClientRead:
 						if ts.router != nil {
 							ts.router.HandleInput(ts.Id(), message)
 						} else {
-							ts.logger.Error("net.tcp.server has no router")
+							ts.logger.Error("input received but no router is configured")
 						}
 					}
 				}
@@ -171,7 +171,7 @@ func (ts *TCPServer) Run() error {
 		<-ts.ctx.Done()
 		close(ts.quit)
 		listener.Close()
-		ts.logger.Debug("router context done in module")
+		ts.logger.Debug("done")
 	}()
 
 AcceptLoop:
@@ -182,7 +182,7 @@ AcceptLoop:
 			case <-ts.quit:
 				break AcceptLoop
 			default:
-				ts.logger.Debug("net.tcp.server problem with listener", "error", err)
+				ts.logger.Debug("problem with listener", "error", err)
 			}
 		} else {
 			ts.wg.Add(1)

internal/module/timer.go

@@ -56,7 +56,7 @@ func (t *Timer) Run() error {
 		select {
 		case <-t.ctx.Done():
 			t.timer.Stop()
-			t.logger.Debug("router context done in module")
+			t.logger.Debug("done")
 			return nil
 		case time := <-t.timer.C:
 			if t.router != nil {

internal/module/udp-client.go

@@ -81,7 +81,7 @@ func (uc *UDPClient) Run() error {
 	}
 
 	<-uc.ctx.Done()
-	uc.logger.Debug("router context done in module")
+	uc.logger.Debug("done")
 	if uc.conn != nil {
 		uc.conn.Close()
 	}

internal/module/udp-multicast.go

@@ -81,7 +81,7 @@ func (um *UDPMulticast) Run() error {
 		select {
 		case <-um.ctx.Done():
 			// TODO(jwetzell): cleanup?
-			um.logger.Debug("router context done in module")
+			um.logger.Debug("done")
 			return nil
 		default:
 			um.conn.SetDeadline(time.Now().Add(time.Millisecond * 200))
@@ -101,7 +101,7 @@ func (um *UDPMulticast) Run() error {
 				if um.router != nil {
 					um.router.HandleInput(um.Id(), message)
 				} else {
-					um.logger.Error("net.udp.multicast has no router")
+					um.logger.Error("input received but no router is configured")
 				}
 			}
 		}

internal/module/udp-server.go

@@ -95,7 +95,7 @@ func (us *UDPServer) Run() error {
 		select {
 		case <-us.ctx.Done():
 			// TODO(jwetzell): cleanup?
-			us.logger.Debug("router context done in module")
+			us.logger.Debug("done")
 			return nil
 		default:
 			listener.SetDeadline(time.Now().Add(time.Millisecond * 200))
@@ -112,7 +112,7 @@ func (us *UDPServer) Run() error {
 			if us.router != nil {
 				us.router.HandleInput(us.Id(), message)
 			} else {
-				us.logger.Error("net.udp.server has no router")
+				us.logger.Error("input received but no router is configured")
 			}
 		}
 	}