request close bugfix

rest_websocket/socket.go

@@ -83,7 +83,7 @@ func (s *Socket) read() {
 					log.Println("data error: ", err)
 					return
 				}
-				log.Println("REQUEST", req.Request.Command, req.Request.Data.JSONPrettyString())
+				//log.Println("REQUEST", req.Request.Command, req.Request.Data.JSONPrettyString())
 				chIn <- req
 			}
 		}
@@ -112,7 +112,7 @@ func (s *Socket) exec() chan<- *rest.RequestStream {
 				case rest.RequestTypeEvent:
 					s.chIn <- req
 				case rest.RequestTypeOut:
-					log.Println("answer in", req.ID)
+					//log.Println("answer in", req.ID)
 					ir, check := s.wait.Load(req.ID)
 					if check {
 						rreq := ir.(*waitRequest)
@@ -133,7 +133,7 @@ func (s *Socket) exec() chan<- *rest.RequestStream {
 				})
 				// отправляем пинг для проверки, живое соединение или нет
 				if s.pingEnable && now.Unix()-s.lastWrite.Load() > 10 {
-					log.Println("PING")
+					//log.Println("PING")
 					//s.writeLocker.Lock()
 					err := s.conn.WriteControl(websocket.PingMessage, nil, time.Now().Add(time.Second))
 					//s.writeLocker.Unlock()

rest_websocket/socket_server.go

@@ -81,20 +81,17 @@ func (s *SocketServer) SendMessage(req rest.IRequestOut) (<-chan *rest.RequestSt
 }
 
 func (s *SocketServer) work() {
-	defer log.Println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
 loop:
 	for {
 		select {
 		case <-s.socket.Context().Done():
 			return
 		case req := <-s.socket.MessagesIn():
-			log.Println("REQUEST ARRIVED...")
 			reqIn := &RequestIn{
 				RequestStream: req,
 				owner:         s,
 				core:          s.appConf.core,
 			}
-			log.Println("reqIN", reqIn)
 			var reqOut rest.IRequestOut
 			command, check := s.appConf.app.Executer(reqIn)
 			if !check {
@@ -102,7 +99,6 @@ loop:
 			} else {
 				// serialize
 				if err := rest.Serialize(reqIn.RData(), command); err != nil {
-					log.Println("serialize error", err)
 					s.socket.Close()
 					return
 				}
@@ -119,7 +115,6 @@ loop:
 				}
 				reqOut = command.Execute(reqIn)
 			}
-			log.Println("RESPPPPP", reqOut)
 			s.SendMessage(reqOut)
 			reqOut.RClose()
 			//s.chIn <- reqIn