Fix #4

diff --git a/log/Log.go b/log/Log.go
index dbb7dcd0b491fd577b45dd8997f4d75b0ca12e6b..a46ab78dd9a780d2dd6e23f045071f66a18664fc 100644 (file)
--- a/log/Log.go
+++ b/log/Log.go
@@ -115,8 +115,6 @@ func (I *Log_interface) Level(log map[string]struct{}) (O *Log_interface) {
 // Open 日志不显示
 func (I *Log_interface) Log_show_control(show bool) (O *Log_interface) {
        O = Copy(I)
-       //
-       O.Block(100)
        O.Stdout = show
        return
 }
@@ -128,8 +126,6 @@ func (I *Log_interface) LShow(show bool) (O *Log_interface) {
 // Open 日志输出至文件
 func (I *Log_interface) Log_to_file(fileP string) (O *Log_interface) {
        O = I
-       //
-       O.Block(100)
        if O.File != `` && fileP != `` {
                O.File = fileP
                f.New(O.File, 0, true).Create()
@@ -142,8 +138,6 @@ func (I *Log_interface) Log_to_file(fileP string) (O *Log_interface) {
 // Open 日志输出至DB
 func (I *Log_interface) LDB(db *sql.DB, insert string) (O *Log_interface) {
        O = I
-       //
-       O.Block(100)
        if db != nil && insert != `` {
                O.DBConn = db
                O.DBInsert = insert
@@ -158,13 +152,6 @@ func (I *Log_interface) LFile(fileP string) (O *Log_interface) {
        return I.Log_to_file(fileP)
 }
 
-// Block 阻塞直到本轮日志输出完毕
-func (I *Log_interface) Block(ms int) (O *Log_interface) {
-       O = I
-       O.MQ.PushLock_tag(`block`, Msg_item{})
-       return
-}
-
 func (I *Log_interface) Close() {
        I.MQ.ClearAll()
        if I.DBConn != nil {

diff --git a/log/Log_test.go b/log/Log_test.go
index ff03f16e86a2089fdc84b00211dfb4b5ee73c713..58af2dea34319ddff4c2b867f4c6b3cbbc5b24a7 100644 (file)
--- a/log/Log_test.go
+++ b/log/Log_test.go
@@ -22,7 +22,7 @@ func Test_1(t *testing.T) {
                Prefix_string: map[string]struct{}{`T:`: On, `I:`: On, `W:`: On, `E:`: On},
        })
 
-       n.L(`T:`, `s`).L(`I:`, `s`).Block(1000)
+       n.L(`T:`, `s`).L(`I:`, `s`)
        n.Log_to_file(`2.log`).L(`W:`, `s`).L(`E:`, `s`)
 
        {
@@ -35,7 +35,6 @@ func Test_1(t *testing.T) {
        }
 
        n.Level(map[string]struct{}{`W:`: On}).L(`T:`, `s`).L(`I:`, `s`).L(`W:`, `s`).L(`E:`, `s`)
-       n.Block(1000)
 }
 
 var n *Log_interface