Browse Source

error highcharts error 15

master
yuriy0803 5 years ago
parent
commit
b22274dad0
  1. 28
      storage/redis.go

28
storage/redis.go

@ -53,8 +53,6 @@ type SumRewardData struct {
Offset int64 `json:"offset"` Offset int64 `json:"offset"`
} }
type RewardData struct { type RewardData struct {
Height int64 `json:"blockheight"` Height int64 `json:"blockheight"`
Timestamp int64 `json:"timestamp"` Timestamp int64 `json:"timestamp"`
@ -203,7 +201,11 @@ func convertPoolChartsResults(raw *redis.ZSliceCmd) []*PoolCharts {
pc.PoolHash, _ = strconv.ParseInt(str[strings.LastIndex(str, ":")+1:], 10, 64) pc.PoolHash, _ = strconv.ParseInt(str[strings.LastIndex(str, ":")+1:], 10, 64)
result = append(result, &pc) result = append(result, &pc)
} }
return result var reverse []*PoolCharts
for i := len(result) - 1; i >= 0; i-- {
reverse = append(reverse, result[i])
}
return reverse
} }
func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts { func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts {
@ -219,7 +221,11 @@ func convertMinerChartsResults(raw *redis.ZSliceCmd) []*MinerCharts {
mc.WorkerOnline = strings.Split(str, ":")[4] mc.WorkerOnline = strings.Split(str, ":")[4]
result = append(result, &mc) result = append(result, &mc)
} }
return result var reverse []*MinerCharts
for i := len(result) - 1; i >= 0; i-- {
reverse = append(reverse, result[i])
}
return reverse
} }
func (r *RedisClient) GetAllMinerAccount() (account []string, err error) { func (r *RedisClient) GetAllMinerAccount() (account []string, err error) {
@ -664,7 +670,7 @@ func (r *RedisClient) WritePayment(login, txHash string, amount int64) error {
} }
func (r *RedisClient) WriteReward(login string, amount int64, percent *big.Rat, immature bool, block *BlockData) error { func (r *RedisClient) WriteReward(login string, amount int64, percent *big.Rat, immature bool, block *BlockData) error {
if (amount <= 0) { if amount <= 0 {
return nil return nil
} }
tx := r.client.Multi() tx := r.client.Multi()
@ -1017,8 +1023,6 @@ func (r *RedisClient) CollectWorkersStats(sWindow, lWindow time.Duration, login
stats["rewards"] = convertRewardResults(cmds[2].(*redis.ZSliceCmd)) // last 40 stats["rewards"] = convertRewardResults(cmds[2].(*redis.ZSliceCmd)) // last 40
rewards := convertRewardResults(cmds[3].(*redis.ZSliceCmd)) // all rewards := convertRewardResults(cmds[3].(*redis.ZSliceCmd)) // all
var dorew []*SumRewardData var dorew []*SumRewardData
dorew = append(dorew, &SumRewardData{Name: "Last 60 minutes", Interval: 3600, Offset: 0}) dorew = append(dorew, &SumRewardData{Name: "Last 60 minutes", Interval: 3600, Offset: 0})
dorew = append(dorew, &SumRewardData{Name: "Last 12 hours", Interval: 3600 * 12, Offset: 0}) dorew = append(dorew, &SumRewardData{Name: "Last 12 hours", Interval: 3600 * 12, Offset: 0})
@ -1253,6 +1257,10 @@ func convertPaymentsResults(raw *redis.ZSliceCmd) []map[string]interface{} {
} }
result = append(result, tx) result = append(result, tx)
} }
var reverse []map[string]interface{}
for i := len(result) - 1; i >= 0; i-- {
reverse = append(reverse, result[i])
}
return result return result
} }
@ -1284,5 +1292,9 @@ func convertPaymentChartsResults(raw *redis.ZSliceCmd) []*PaymentCharts {
result = append(result, &pc) result = append(result, &pc)
} }
} }
return result var reverse []*PaymentCharts
for i := len(result) - 1; i >= 0; i-- {
reverse = append(reverse, result[i])
}
return reverse
} }
Loading…
Cancel
Save