rouggy/FlexDXCluster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update log

Browse Source
This commit is contained in:
Gregory Salaun
2024-10-31 11:14:35 +07:00
parent 91fc5836eb
commit f571d8ea18
8 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
TCPClient.go
View File

@ -34,7 +34,7 @@ type TCPClient struct {
Countries Countries
}
func NewTCPClient(TCPServer *TCPServer, log *log.Logger, Countries Countries) *TCPClient {
func NewTCPClient(TCPServer *TCPServer, Countries Countries) *TCPClient {
return &TCPClient{
Address: Cfg.Cluster.Server,
Port: Cfg.Cluster.Port,
@ -42,7 +42,6 @@ func NewTCPClient(TCPServer *TCPServer, log *log.Logger, Countries Countries) *T
MsgChan: TCPServer.MsgChan,
CmdChan: TCPServer.CmdChan,
SpotChanToFlex: make(chan TelnetSpot, 100),
Log: log,
TCPServer: *TCPServer,
SpotChanToHTTPServer: make(chan TelnetSpot, 100),
Countries: Countries,
@ -63,19 +62,19 @@ func (c *TCPClient) StartClient() {
addr, err := net.ResolveTCPAddr("tcp", c.Address+":"+c.Port)
if err != nil {
c.Log.Error("Cannot resolve Telnet Client address:", err)
Log.Error("Cannot resolve Telnet Client address:", err)
}
c.setDefaultParams()
c.Conn, err = net.DialTCP("tcp", nil, addr)
if err != nil {
c.Log.Error("Cannot connect to Telnet Client:", err)
Log.Error("Cannot connect to Telnet Client:", err)
}
c.Log.Infof("Connected to DX cluster %s:%s", c.Address, c.Port)
Log.Infof("Connected to DX cluster %s:%s", c.Address, c.Port)
err = c.Conn.SetKeepAlive(true)
if err != nil {
c.Log.Error("Error while setting keep alive:", err)
Log.Error("Error while setting keep alive:", err)
}
c.Reader = bufio.NewReader(c.Conn)
@ -83,7 +82,7 @@ func (c *TCPClient) StartClient() {
go func() {
for message := range c.TCPServer.CmdChan {
c.Log.Infof("Received DX Command: %s", message)
Log.Infof("Received DX Command: %s", message)
message := message + "\n"
c.WriteString(message)
}
@ -100,32 +99,32 @@ func (c *TCPClient) Close() {
func (c *TCPClient) SetFilters() {
if Cfg.Cluster.FT8 {
c.Write([]byte("set/ft8\r\n"))
c.Log.Info("FT8: On")
Log.Info("FT8: On")
}
if Cfg.Cluster.Skimmer {
c.Write([]byte("set/skimmer\r\n"))
c.Log.Info("Skimmer: On")
Log.Info("Skimmer: On")
}
if Cfg.Cluster.FT4 {
c.Write([]byte("set/ft4\r\n"))
c.Log.Info("FT4: On")
Log.Info("FT4: On")
}
if !Cfg.Cluster.FT8 {
c.Write([]byte("set/noft8\r\n"))
c.Log.Info("FT8: Off")
Log.Info("FT8: Off")
}
if !Cfg.Cluster.FT4 {
c.Write([]byte("set/noft4\r\n"))
c.Log.Info("FT4: Off")
Log.Info("FT4: Off")
}
if !Cfg.Cluster.Skimmer {
c.Write([]byte("set/noskimmer\r\n"))
c.Log.Info("Skimmer: Off")
Log.Info("Skimmer: Off")
}
}
@ -134,12 +133,12 @@ func (c *TCPClient) ReadLine() {
for {
message, err := c.Reader.ReadString('\n')
if err != nil {
c.Log.Errorf("Error reading message: %s", err)
Log.Errorf("Error reading message: %s", err)
continue
}
if strings.Contains(message, Cfg.Cluster.LoginPrompt+" \r\n") {
c.Log.Debug("Found login prompt...sending callsign")
Log.Debug("Found login prompt...sending callsign")
c.Write([]byte(c.Login + "\r\n"))
time.Sleep(time.Second * 2)
c.SetFilters()
@ -147,7 +146,7 @@ func (c *TCPClient) ReadLine() {
if Cfg.Cluster.Command != "" {
c.WriteString(Cfg.Cluster.Command)
}
c.Log.Info("Start receiving spots")
Log.Info("Start receiving spots")
}
// start := time.Now()