From 8ad6d819e5f6ea4da66d3632cbfcc53afa652066 Mon Sep 17 00:00:00 2001 From: postmannen Date: Thu, 9 Sep 2021 13:32:04 +0200 Subject: [PATCH] removed not need argument from readTcpListener --- read_socket_or_tcp_listener.go | 10 +++++----- server.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/read_socket_or_tcp_listener.go b/read_socket_or_tcp_listener.go index bbd5c2d..d94f336 100644 --- a/read_socket_or_tcp_listener.go +++ b/read_socket_or_tcp_listener.go @@ -71,7 +71,7 @@ func (s *server) readSocket() { // port if started. // It will take a channel of []byte as input, and it is in this // channel the content of a file that has changed is returned. -func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) { +func (s *server) readTCPListener() { ln, err := net.Listen("tcp", s.configuration.TCPListener) if err != nil { log.Printf("error: readTCPListener: failed to start tcp listener: %v\n", err) @@ -83,7 +83,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) { conn, err := ln.Accept() if err != nil { er := fmt.Errorf("error: failed to accept conn on socket: %v", err) - sendErrorLogMessage(s.configuration, s.metrics, toRingbufferCh, Node(s.nodeName), er) + sendErrorLogMessage(s.configuration, s.metrics, s.newMessagesCh, Node(s.nodeName), er) continue } @@ -97,7 +97,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) { _, err = conn.Read(b) if err != nil && err != io.EOF { er := fmt.Errorf("error: failed to read data from tcp listener: %v", err) - sendErrorLogMessage(s.configuration, s.metrics, toRingbufferCh, Node(s.nodeName), er) + sendErrorLogMessage(s.configuration, s.metrics, s.newMessagesCh, Node(s.nodeName), er) return } @@ -114,7 +114,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) { sam, err := s.convertBytesToSAMs(readBytes) if err != nil { er := fmt.Errorf("error: malformed json: %v", err) - sendErrorLogMessage(s.configuration, s.metrics, toRingbufferCh, Node(s.nodeName), er) + sendErrorLogMessage(s.configuration, s.metrics, s.newMessagesCh, Node(s.nodeName), er) return } @@ -126,7 +126,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) { } // Send the SAM struct to be picked up by the ring buffer. - toRingbufferCh <- sam + s.newMessagesCh <- sam }(conn) } diff --git a/server.go b/server.go index a90bc05..75bd0f4 100644 --- a/server.go +++ b/server.go @@ -216,7 +216,7 @@ func (s *server) Start() { // Check if we should start the tcp listener fro new messages from operator. if s.configuration.TCPListener != "" { - go s.readTCPListener(s.newMessagesCh) + go s.readTCPListener() } // Start up the predefined subscribers.