invoke codec.go:(EventListener)OnClose when got error

codec.go

@@ -39,7 +39,7 @@ type EventListener interface {
 	// If the return error is not nil, @Session will be closed.
 	OnOpen(*Session) error
 
-	// invoked when session closed. when @Session got error, session will not invoke @OnClose but invoke @OnError.
+	// invoked when session closed.
 	OnClose(*Session)
 
 	// invoked when got error.

dev.list

@@ -11,6 +11,11 @@
 ## develop history ##
 ---
 
+- 2016/10/10
+    > 1 delete session.go:Session{errFlag} to invoke codec.go:EventListener{OnClose&OnError} both when got a error
+    >
+	> 2 version: 0.4.01
+
 - 2016/10/09
     > 1 add client.go:NewWSSClient
     >

server.go

@@ -147,6 +147,7 @@ func newWSHandler(server *Server, newSession NewSessionCallback) *wsHandler {
 }
 
 func (this *wsHandler) ServeWSRequest(w http.ResponseWriter, r *http.Request) {
+	log.Debug("get client request:%#v", r)
 	if r.Method != "GET" {
 		// w.WriteHeader(http.StatusMethodNotAllowed)
 		http.Error(w, "Method not allowed", 405)

session.go

@@ -61,7 +61,7 @@ type Session struct {
 	listener EventListener
 	once     sync.Once
 	done     chan empty
-	errFlag  bool
+	// errFlag  bool
 
 	period    time.Duration
 	rDeadline time.Duration // network current limiting
@@ -119,7 +119,7 @@ func (this *Session) Reset() {
 	this.name = defaultSessionName
 	this.once = sync.Once{}
 	this.done = make(chan empty)
-	this.errFlag = false
+	// this.errFlag = false
 	this.period = period
 	this.rDeadline = netIOTimeout
 	this.wDeadline = netIOTimeout
@@ -418,9 +418,9 @@ func (this *Session) handleLoop() {
 		}
 
 		grNum = atomic.AddInt32(&(this.grNum), -1)
-		if !this.errFlag {
-			this.listener.OnClose(this)
-		}
+		// if !this.errFlag {
+		this.listener.OnClose(this)
+		// }
 		log.Info("%s, [session.handleLoop] goroutine exit now, left gr num %d", this.Stat(), grNum)
 		this.gc()
 	}()
@@ -494,7 +494,8 @@ func (this *Session) handlePackage() {
 		grNum = atomic.AddInt32(&(this.grNum), -1)
 		log.Info("%s, [session.handlePackage] gr will exit now, left gr num %d", this.sessionToken(), grNum)
 		this.stop()
-		if this.errFlag {
+		// if this.errFlag {
+		if err != nil {
 			log.Error("%s, [session.handlePackage] error{%#v}", this.sessionToken(), err)
 			this.listener.OnError(this, err)
 		}
@@ -512,10 +513,9 @@ func (this *Session) handleTCPPackage() error {
 	var (
 		err error
 		// nerr    net.Error
-		conn *gettyTCPConn
-		ok   bool
-		exit bool
-		// errFlag bool
+		conn   *gettyTCPConn
+		ok     bool
+		exit   bool
 		bufLen int
 		pkgLen int
 		buf    []byte
@@ -544,7 +544,7 @@ func (this *Session) handleTCPPackage() error {
 				// }
 				log.Error("%s, [session.conn.read] = error{%v}", this.sessionToken(), err)
 				// for (Codec)OnErr
-				this.errFlag = true
+				// this.errFlag = true
 				exit = true
 			}
 			break
@@ -565,8 +565,7 @@ func (this *Session) handleTCPPackage() error {
 			if err != nil {
 				log.Info("%s, [session.pkgHandler.Read] = error{%+v}", this.sessionToken(), err)
 				// for (Codec)OnErr
-				// errFlag = true
-				this.errFlag = true
+				// this.errFlag = true
 				exit = true
 				break
 			}
@@ -604,7 +603,7 @@ func (this *Session) handleWSPackage() error {
 		pkg, err = conn.read()
 		if err != nil {
 			log.Info("%s, [session.handleWSPackage.Read] = error{%+v}", this.sessionToken(), err)
-			this.errFlag = true
+			// this.errFlag = true
 			return err
 		}
 		this.rQ <- pkg

version.go

@@ -10,6 +10,9 @@
 package getty
 
 const (
-	Version = "0.4.0"
-	DATE    = "2016/10/08"
+	Version     = "0.4.01"
+	DATE        = "2016/10/10"
+	GETTY_MAJOR = 0
+	GETTY_MINOR = 4
+	GETTY_BUILD = 1
 )