人气精简

diff --git a/Reply/F.go b/Reply/F.go
index c48bccad3b20e3a03592bbc30af1c8b3e86b54b7..ec43ab54d3daca097790cd0bfaa951cb4d7d7085 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -777,6 +777,12 @@ func Savestreamf(){
                                        }
                                }(bc,&item,exit_chan)
 
+                               expires := int64(exp) - p.Sys().GetSTime()-120
+                               // no expect qn
+                               if c.Live_want_qn < c.Live_qn {
+                                       expires = time.Now().Add(time.Minute*2).Unix()
+                               }
+
                                //等待过期/退出
                                {
                                        var exit_sign bool
@@ -784,7 +790,7 @@ func Savestreamf(){
                                        case <- req_exit.Chan:;//本次连接错误，退出重试
                                        case <- exit_chan.Chan://要求退出
                                                exit_sign = true//
-                                       case <- time.After(time.Second*time.Duration(int(int64(exp) - p.Sys().GetSTime())-120)):;
+                                       case <- time.After(time.Second*time.Duration(int(expires))):;
                                        }
                                        if exit_sign {
                                                //退出

diff --git a/Reply/Reply.go b/Reply/Reply.go
index 67a85d97c646b15ffdeec1d87a13dde55ec859dc..b6ecd4b6736c920a42a85904419b3402cd5ae6a1 100644 (file)
--- a/Reply/Reply.go
+++ b/Reply/Reply.go
@@ -269,7 +269,9 @@ func (replyF) heartbeat(s int){
                tmp = `(`+tmp+`)`
        }
 
-       fmt.Printf("\t人气:%d %s\n", s, tmp)
+       if renqi_old != s {
+               fmt.Printf("\t人气:%d %s\n", s, tmp)
+       }
        reply_log.Base_add(`人气`).Log_show_control(false).L(`I: `,"当前人气", s)
        renqi_old = s
 }