mirrors/ctrl
1
0
Fork 0
mirror of https://github.com/postmannen/ctrl.git synced 2025-03-15 10:57:42 +00:00
Code Activity

removed not need argument from readTcpListener

Browse source
This commit is contained in:
postmannen 2021-09-09 13:32:04 +02:00
parent 08fb8e3445
commit 8ad6d819e5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
read_socket_or_tcp_listener.go
View file

@ -71,7 +71,7 @@ func (s *server) readSocket() {
// port if started. // port if started.
// It will take a channel of []byte as input, and it is in this // 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. // 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) ln, err := net.Listen("tcp", s.configuration.TCPListener)
if err != nil { if err != nil {
log.Printf("error: readTCPListener: failed to start tcp listener: %v\n", err) 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() conn, err := ln.Accept()
if err != nil { if err != nil {
er := fmt.Errorf("error: failed to accept conn on socket: %v", err) 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 continue
} }
@ -97,7 +97,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) {
_, err = conn.Read(b) _, err = conn.Read(b)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
er := fmt.Errorf("error: failed to read data from tcp listener: %v", err) 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 return
} }
@ -114,7 +114,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) {
sam, err := s.convertBytesToSAMs(readBytes) sam, err := s.convertBytesToSAMs(readBytes)
if err != nil { if err != nil {
er := fmt.Errorf("error: malformed json: %v", err) 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 return
} }
@ -126,7 +126,7 @@ func (s *server) readTCPListener(toRingbufferCh chan []subjectAndMessage) {
} }
// Send the SAM struct to be picked up by the ring buffer. // Send the SAM struct to be picked up by the ring buffer.
toRingbufferCh <- sam s.newMessagesCh <- sam
}(conn) }(conn)
} }

2
server.go
View file

@ -216,7 +216,7 @@ func (s *server) Start() {
// Check if we should start the tcp listener fro new messages from operator. // Check if we should start the tcp listener fro new messages from operator.
if s.configuration.TCPListener != "" { if s.configuration.TCPListener != "" {
go s.readTCPListener(s.newMessagesCh) go s.readTCPListener()
} }
// Start up the predefined subscribers. // Start up the predefined subscribers.