diff --git a/src/components/Rankings.jsx b/src/components/Rankings.jsx index 46fd3a4..0ccb1fe 100644 --- a/src/components/Rankings.jsx +++ b/src/components/Rankings.jsx @@ -66,20 +66,20 @@ const Rankings = () => { {(orderDaily) ? totalDailyRanking.map((rank) => ( - {rank.dailyRanking} + {rank.dr} {rank.name} - {rank.dailyTotalPixels} - {rank.ranking} - {rank.totalPixels} + {rank.dt} + {rank.r} + {rank.t} )) : totalRanking.map((rank) => ( - {rank.ranking} + {rank.r} {rank.name} - {rank.totalPixels} - {rank.dailyRanking} - {rank.dailyTotalPixels} + {rank.t} + {rank.dr} + {rank.dt} ))} diff --git a/src/core/Ranks.js b/src/core/Ranks.js index 745ccc6..03fc283 100644 --- a/src/core/Ranks.js +++ b/src/core/Ranks.js @@ -32,7 +32,7 @@ class Ranks { async initialize() { this.prevTop = await loadDailyTop(); await this.updateRanking(); - setInterval(this.updateRanking, 10 * MINUTE); + setInterval(this.updateRanking, 1 * MINUTE); DailyCron.hook(this.resetDailyRanking); } diff --git a/src/core/session.js b/src/core/session.js index 6944db4..3f9d9d0 100644 --- a/src/core/session.js +++ b/src/core/session.js @@ -7,13 +7,15 @@ import RedisStore from '../utils/connectRedis'; import client from '../data/redis/client'; import { getHostFromRequest } from '../utils/ip'; import { HOUR, COOKIE_SESSION_NAME } from './constants'; -import { SESSION_SECRET } from './config'; +import { SESSION_SECRET, SHARD_NAME } from './config'; const middlewareStore = {}; export default (req, res, next) => { - const domain = getHostFromRequest(req, false, true); + const domain = (SHARD_NAME) + ? getHostFromRequest(req, false, true) + : null; let sess = middlewareStore[domain]; if (!sess) { const store = new RedisStore({ client }); diff --git a/src/data/redis/ranks.js b/src/data/redis/ranks.js index 98947cf..ce0f2df 100644 --- a/src/data/redis/ranks.js +++ b/src/data/redis/ranks.js @@ -43,18 +43,18 @@ export async function getRanks(daily, start, amount) { let oRankName; if (daily) { key = DAILY_RANKED_KEY; - valueName = 'dailyTotalPixels'; - rankName = 'dailyRanking'; + valueName = 'dt'; + rankName = 'dr'; oKey = RANKED_KEY; - oValueName = 'totalPixels'; - oRankName = 'ranking'; + oValueName = 't'; + oRankName = 'r'; } else { key = RANKED_KEY; - valueName = 'totalPixels'; - rankName = 'ranking'; + valueName = 't'; + rankName = 'r'; oKey = DAILY_RANKED_KEY; - oValueName = 'dailyTotalPixels'; - oRankName = 'dailyRanking'; + oValueName = 'dt'; + oRankName = 'dr'; } /* returns { value: uid, score: pixelCnt } */ const ranks = await client.zRangeWithScores(key, start, start + amount, {