fix #36, #44, #45

super3 · Feb 25, 2019 · 9db9c61 · 9db9c61
1 parent fa0cd27
commit 9db9c61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,9 @@ Yet Another CDN.
 [![Coverage Status](https://coveralls.io/repos/github/ovsoinc/yacdn.org/badge.svg?branch=master)](https://coveralls.io/github/ovsoinc/yacdn.org?branch=master)
 [![License](https://img.shields.io/badge/license-AGPLv3-blue.svg?label=license)](https://github.com/Storj/ovsoinc/yacdn.org/blob/master/LICENSE)
 [![CDN Hits](https://img.shields.io/badge/dynamic/json.svg?label=CDN%20Hits&url=https://yacdn.org/stats&query=$.cdnHits&colorB=green)](https://img.shields.io/badge/dynamic/json.svg?label=CDN%20Hits&url=https://yacdn.org/stats&query=$.cdnHits&colorB=green)
+[![CDN Data](https://img.shields.io/badge/dynamic/json.svg?label=CDN%20Data&url=https://yacdn.org/stats&query=$.cdnData&colorB=blue)](https://img.shields.io/badge/dynamic/json.svg?label=CDN%20Data&url=https://yacdn.org/stats&query=$.cdnData&colorB=blue)
 [![Proxy Hits](https://img.shields.io/badge/dynamic/json.svg?label=Proxy%20Hits&url=https://yacdn.org/stats&query=$.proxyHits&colorB=green)](https://img.shields.io/badge/dynamic/json.svg?label=Proxy%20Hits&url=https://yacdn.org/stats&query=$.proxyHits&colorB=green)
+[![Proxy Data](https://img.shields.io/badge/dynamic/json.svg?label=Proxy%20Hits&url=https://yacdn.org/stats&query=$.proxyData&colorB=blue)](https://img.shields.io/badge/dynamic/json.svg?label=Proxy%20Data&url=https://yacdn.org/stats&query=$.proxyData&colorB=blue)
 
 ## CDN
 

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "test": "npm run testsuite && npm run linter",
     "testsuite": "jest --forceExit",
-    "coverage": "istanbul cover node_modules/mocha/bin/_mocha -- -R spec --exit",
+    "coverage": "jest --forceExit --coverage",
     "linter": "xo",
     "start": "node server.js"
   },

diff --git a/server.js b/server.js
@@ -107,9 +107,9 @@ app.use(async ctx => {
 
 	ctx.body = {
 		cdnHits: Number(await redis.get('cdnhits')),
-		cdnData: Number(await redis.get('cdndata')),
+		cdnData: `${(Number(await redis.get('cdndata')) / Math.pow(1024, 3)).toFixed(2)} GB`,
 		proxyHits: Number(await redis.get('proxyhits')),
-		proxyData: Number(await redis.get('proxydata'))
+		proxyData: `${(Number(await redis.get('proxydata')) / Math.pow(1024, 3)).toFixed(2)} GB`
 	};
 });
 

diff --git a/test/server.test.js b/test/server.test.js
@@ -41,7 +41,7 @@ describe('/stats', async () => {
 
 	assert.strictEqual(typeof data, 'object');
 	assert.strictEqual(typeof data.cdnHits, 'number');
-	assert.strictEqual(typeof data.cdnData, 'number');
+	assert.strictEqual(typeof data.cdnData, 'string');
 	assert.strictEqual(typeof data.proxyHits, 'number');
-	assert.strictEqual(typeof data.proxyData, 'number');
+	assert.strictEqual(typeof data.proxyData, 'string');
 });