up

TCPClient.go

@@ -15,37 +15,37 @@ var spotRe *regexp.Regexp = regexp.MustCompile(`DX\sde\s([\w\d]+).*:\s+(\d+.\d)\
 var count int = 0
 
 type TCPClient struct {
-	Login      string
-	Password   string
-	Address    string
-	Port       string
-	Timeout    time.Duration
-	LogWriter  *bufio.Writer
-	Reader     *bufio.Reader
-	Writer     *bufio.Writer
-	Conn       *net.TCPConn
-	TCPServer  TCPServer
-	FlexClient FlexClient
-	MsgChan    chan string
-	CmdChan    chan string
-	SpotChan   chan TelnetSpot
-	Log        *log.Logger
-	Config     *Config
-	Countries  Countries
+	Login                string
+	Password             string
+	Address              string
+	Port                 string
+	Timeout              time.Duration
+	LogWriter            *bufio.Writer
+	Reader               *bufio.Reader
+	Writer               *bufio.Writer
+	Conn                 *net.TCPConn
+	TCPServer            TCPServer
+	MsgChan              chan string
+	CmdChan              chan string
+	SpotChanToFlex       chan TelnetSpot
+	SpotChanToHTTPServer chan TelnetSpot
+	Log                  *log.Logger
+	Config               *Config
+	Countries            Countries
 }
 
-func NewTCPClient(TCPServer *TCPServer, FlexClient *FlexClient, log *log.Logger, Countries Countries) *TCPClient {
+func NewTCPClient(TCPServer *TCPServer, log *log.Logger, Countries Countries) *TCPClient {
 	return &TCPClient{
-		Address:    Cfg.Cluster.Server,
-		Port:       Cfg.Cluster.Port,
-		Login:      Cfg.Cluster.Login,
-		MsgChan:    TCPServer.MsgChan,
-		CmdChan:    TCPServer.CmdChan,
-		SpotChan:   FlexClient.SpotChan,
-		Log:        log,
-		TCPServer:  *TCPServer,
-		FlexClient: *FlexClient,
-		Countries:  Countries,
+		Address:              Cfg.Cluster.Server,
+		Port:                 Cfg.Cluster.Port,
+		Login:                Cfg.Cluster.Login,
+		MsgChan:              TCPServer.MsgChan,
+		CmdChan:              TCPServer.CmdChan,
+		SpotChanToFlex:       make(chan TelnetSpot, 100),
+		Log:                  log,
+		TCPServer:            *TCPServer,
+		SpotChanToHTTPServer: make(chan TelnetSpot, 100),
+		Countries:            Countries,
 	}
 }
 
@@ -151,7 +151,7 @@ func (c *TCPClient) ReadLine() {
 		}
 
 		// start := time.Now()
-		go ProcessTelnetSpot(spotRe, message, c.SpotChan, c.Countries)
+		go ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
 		// elapsed := time.Since(start)
 		// Log.Infof("Total time for processing spot: %s", elapsed)