Remove Human Readable Online Stats

StorjOld · Oct 23, 2015 · a2cea5d · a2cea5d
1 parent b317e6b
commit a2cea5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git a/dataserv/app.py b/dataserv/app.py
@@ -118,22 +118,6 @@ def get_address():
     return jsonify({"address": app.config["ADDRESS"]})
 
 
-@app.route('/api/online', methods=["GET"])
-@cache.cached(timeout=app.config["CACHING_TIME"], unless=disable_caching)
-def online():
-    """Display a readable list of online farmers."""
-    logger.info("CALLED /api/online")
-    output = ""
-    current_time = datetime.datetime.utcnow()
-    text = "{0} |  Last Seen: {1} | Height: {2}<br/>"
-
-    for farmer in online_farmers():
-        last_seen = secs_to_mins((current_time - farmer.last_seen).seconds)
-        output += text.format(farmer.payout_addr, last_seen, farmer.height)
-
-    return output
-
-
 @app.route('/api/online/json', methods=["GET"])
 @cache.cached(timeout=app.config["CACHING_TIME"], unless=disable_caching)
 def online_json():

diff --git a/tests/test_App.py b/tests/test_App.py
@@ -182,7 +182,7 @@ def test_online(self):
         self.app.get('/api/ping/{0}'.format(btc_addr))
 
         # get online data
-        rv = self.app.get('/api/online')
+        rv = self.app.get('/api/online/json')
 
         # see if that address is in the online status
         self.assertTrue(btc_addr in str(rv.data))
@@ -239,7 +239,7 @@ def test_farmer_set_height(self):
         # correct
         rv = self.app.get('/api/height/{0}/5'.format(btc_addr))
         self.assertEqual(rv.status_code, 200)
-        rv = self.app.get('/api/online'.format(btc_addr))
+        rv = self.app.get('/api/online/json'.format(btc_addr))
         self.assertTrue(b"5" in rv.data)
 
         # invalid btc address
@@ -252,7 +252,7 @@ def test_height_limit(self):
 
         # set height 50
         self.app.get('/api/height/{0}/{1}'.format(btc_addr, 50))
-        rv = self.app.get('/api/online')
+        rv = self.app.get('/api/online/json')
         self.assertTrue(b"50" in rv.data)
 
         # set a crazy height
@@ -413,13 +413,6 @@ def test_farmer_total_bytes(self):
         self.app.get('/api/height/{0}/{1}'.format(addr3, 2525))
         self.app.get('/api/height/{0}/{1}'.format(addr4, 5000))
 
-        # check online
-        rv = self.app.get('/api/online')
-        self.assertTrue(b"0" in rv.data)
-        self.assertTrue(b"2475" in rv.data)
-        self.assertTrue(b"2525" in rv.data)
-        self.assertTrue(b"5000" in rv.data)
-
         # check total bytes
         rv = self.app.get('/api/total')
         self.assertTrue(b'"total_TB": 1.22' in rv.data)