update

app/save.go

@@ -59,34 +59,23 @@ func getSumTokens() int64 {
 func saveDB() {
 	hours, _, _ := time.Now().Clock()
 
-	bulk := make(map[int]saveData)
+	bulk := []saveData{}
-	update := make(map[int64]int64)
+	update := []struct {
+		Rid int64
+		Now int64
+	}{}
+
 	data := make(map[string]*DonatorCache)
 	index := make(map[string]int64)
 
+	ticker := time.NewTicker(10 * time.Second)
+
 	index = map[string]int64{"hours": int64(hours), "tokens": getSumTokens(), "last": time.Now().Unix()}
 
 	for {
 		select {
-		case m := <-save:
+		case <-ticker.C:
-			//fmt.Println("Save channel:", len(save), cap(save))
+			if len(bulk) > 0 {
-
-			now := time.Now().Unix()
-
-			if _, ok := data[m.From]; ok {
-				data[m.From].Last = now
-			} else {
-				data[m.From] = &DonatorCache{Id: getDonId(m.From), Last: now}
-			}
-
-			num := len(bulk)
-
-			bulk[num] = m
-
-			update[m.Rid] = m.Now
-
-			if num > 512 {
-
 				tx, err := Mysql.Begin()
 				if err == nil {
 					st, _ := tx.Prepare("INSERT INTO `stat` (`did`, `rid`, `token`, `time`) VALUES (?, ?, ?, ?)")
@@ -100,8 +89,8 @@ func saveDB() {
 				tx, err = Mysql.Begin()
 				if err == nil {
 					st, _ := tx.Prepare("UPDATE `room` SET `last` = ? WHERE `id` = ?")
-					for k, v := range update {
+					for _, v := range update {
-						st.Exec(v, k)
+						st.Exec(v.Now, v.Rid)
 					}
 					tx.Commit()
 					st.Close()
@@ -117,9 +106,28 @@ func saveDB() {
 					st.Close()
 				}
 
-				bulk = make(map[int]saveData)
+				bulk = nil
-				update = make(map[int64]int64)
+				update = nil
 			}
+		case m := <-save:
+			//fmt.Println("Save channel:", len(save), cap(save))
+
+			now := time.Now().Unix()
+
+			if _, ok := data[m.From]; ok {
+				data[m.From].Last = now
+			} else {
+				data[m.From] = &DonatorCache{Id: getDonId(m.From), Last: now}
+			}
+
+			bulk = append(bulk, m)
+			update = append(update, struct {
+				Rid int64
+				Now int64
+			}{
+				Rid: m.Rid,
+				Now: m.Now,
+			})
 
 			if m.Amount > 99 {
 				msg, err := json.Marshal(struct {
@@ -168,14 +176,12 @@ func saveDB() {
 }
 
 func saveLogs() {
-	bulk := make(map[int]saveLog)
+	bulk := []saveLog{}
+	ticker := time.NewTicker(10 * time.Second)
 	for {
 		select {
-		case m := <-slog:
+		case <-ticker.C:
-			if len(m.Mes) > 0 {
+			if len(bulk) > 0 {
-				num := len(bulk)
-				bulk[num] = m
-				if num > 2048 {
 				tx, err := Mysql.Begin()
 				if err == nil {
 					st, _ := tx.Prepare("INSERT INTO `logs` (`rid`, `time`, `mes`) VALUES (?, ?, ?)")
@@ -185,8 +191,11 @@ func saveLogs() {
 					tx.Commit()
 					st.Close()
 				}
-					bulk = make(map[int]saveLog)
+				bulk = nil
-				}
+			}
+		case m := <-slog:
+			if len(m.Mes) > 0 {
+				bulk = append(bulk, m)
 			}
 		}
 	}

app/worker.go

@@ -127,6 +127,11 @@ func xWorker(workerData Info, u url.URL) {
 
 		now := time.Now().Unix()
 
+		if now > workerData.Start+60*60*8 {
+			fmt.Println("too_long exit:", workerData.room)
+			return
+		}
+
 		m := string(message)
 		slog <- saveLog{Rid: workerData.Rid, Now: now, Mes: m}