dont set cookie domain when not shard
rename keys in total rankings to be smaller
This commit is contained in:
parent
e320ecd6a9
commit
1dd6700834
|
@ -66,20 +66,20 @@ const Rankings = () => {
|
||||||
{(orderDaily)
|
{(orderDaily)
|
||||||
? totalDailyRanking.map((rank) => (
|
? totalDailyRanking.map((rank) => (
|
||||||
<tr key={rank.name}>
|
<tr key={rank.name}>
|
||||||
<td>{rank.dailyRanking}</td>
|
<td>{rank.dr}</td>
|
||||||
<td><span>{rank.name}</span></td>
|
<td><span>{rank.name}</span></td>
|
||||||
<td>{rank.dailyTotalPixels}</td>
|
<td>{rank.dt}</td>
|
||||||
<td>{rank.ranking}</td>
|
<td>{rank.r}</td>
|
||||||
<td>{rank.totalPixels}</td>
|
<td>{rank.t}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))
|
))
|
||||||
: totalRanking.map((rank) => (
|
: totalRanking.map((rank) => (
|
||||||
<tr key={rank.name}>
|
<tr key={rank.name}>
|
||||||
<td>{rank.ranking}</td>
|
<td>{rank.r}</td>
|
||||||
<td><span>{rank.name}</span></td>
|
<td><span>{rank.name}</span></td>
|
||||||
<td>{rank.totalPixels}</td>
|
<td>{rank.t}</td>
|
||||||
<td>{rank.dailyRanking}</td>
|
<td>{rank.dr}</td>
|
||||||
<td>{rank.dailyTotalPixels}</td>
|
<td>{rank.dt}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -32,7 +32,7 @@ class Ranks {
|
||||||
async initialize() {
|
async initialize() {
|
||||||
this.prevTop = await loadDailyTop();
|
this.prevTop = await loadDailyTop();
|
||||||
await this.updateRanking();
|
await this.updateRanking();
|
||||||
setInterval(this.updateRanking, 10 * MINUTE);
|
setInterval(this.updateRanking, 1 * MINUTE);
|
||||||
DailyCron.hook(this.resetDailyRanking);
|
DailyCron.hook(this.resetDailyRanking);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,15 @@ import RedisStore from '../utils/connectRedis';
|
||||||
import client from '../data/redis/client';
|
import client from '../data/redis/client';
|
||||||
import { getHostFromRequest } from '../utils/ip';
|
import { getHostFromRequest } from '../utils/ip';
|
||||||
import { HOUR, COOKIE_SESSION_NAME } from './constants';
|
import { HOUR, COOKIE_SESSION_NAME } from './constants';
|
||||||
import { SESSION_SECRET } from './config';
|
import { SESSION_SECRET, SHARD_NAME } from './config';
|
||||||
|
|
||||||
|
|
||||||
const middlewareStore = {};
|
const middlewareStore = {};
|
||||||
|
|
||||||
export default (req, res, next) => {
|
export default (req, res, next) => {
|
||||||
const domain = getHostFromRequest(req, false, true);
|
const domain = (SHARD_NAME)
|
||||||
|
? getHostFromRequest(req, false, true)
|
||||||
|
: null;
|
||||||
let sess = middlewareStore[domain];
|
let sess = middlewareStore[domain];
|
||||||
if (!sess) {
|
if (!sess) {
|
||||||
const store = new RedisStore({ client });
|
const store = new RedisStore({ client });
|
||||||
|
|
|
@ -43,18 +43,18 @@ export async function getRanks(daily, start, amount) {
|
||||||
let oRankName;
|
let oRankName;
|
||||||
if (daily) {
|
if (daily) {
|
||||||
key = DAILY_RANKED_KEY;
|
key = DAILY_RANKED_KEY;
|
||||||
valueName = 'dailyTotalPixels';
|
valueName = 'dt';
|
||||||
rankName = 'dailyRanking';
|
rankName = 'dr';
|
||||||
oKey = RANKED_KEY;
|
oKey = RANKED_KEY;
|
||||||
oValueName = 'totalPixels';
|
oValueName = 't';
|
||||||
oRankName = 'ranking';
|
oRankName = 'r';
|
||||||
} else {
|
} else {
|
||||||
key = RANKED_KEY;
|
key = RANKED_KEY;
|
||||||
valueName = 'totalPixels';
|
valueName = 't';
|
||||||
rankName = 'ranking';
|
rankName = 'r';
|
||||||
oKey = DAILY_RANKED_KEY;
|
oKey = DAILY_RANKED_KEY;
|
||||||
oValueName = 'dailyTotalPixels';
|
oValueName = 'dt';
|
||||||
oRankName = 'dailyRanking';
|
oRankName = 'dr';
|
||||||
}
|
}
|
||||||
/* returns { value: uid, score: pixelCnt } */
|
/* returns { value: uid, score: pixelCnt } */
|
||||||
const ranks = await client.zRangeWithScores(key, start, start + amount, {
|
const ranks = await client.zRangeWithScores(key, start, start + amount, {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user