|
@@ -14,6 +14,8 @@ import socket
|
|
|
from SocketServer import ThreadingMixIn
|
|
|
import time
|
|
|
|
|
|
+import ffstatus
|
|
|
+
|
|
|
class BatcaveHttpRequestHandler(BaseHTTPRequestHandler):
|
|
|
DATAKEY_VPN = '__VPN__'
|
|
|
FIELDKEY_UPDATED = '__UPDATED__'
|
|
@@ -250,9 +252,14 @@ class BatcaveHttpRequestHandler(BaseHTTPRequestHandler):
|
|
|
self.send_error(404, 'No node with id \'' + rawid + '\' present.')
|
|
|
return
|
|
|
|
|
|
+ # remove fields from output: __RAW__
|
|
|
+ export = ffstatus.dict_merge({}, node)
|
|
|
+ if '__RAW__' in export:
|
|
|
+ del(export['__RAW__'])
|
|
|
+
|
|
|
# dump node data as JSON
|
|
|
self.send_headers('text/json')
|
|
|
- self.wfile.write(json.dumps(node))
|
|
|
+ self.wfile.write(json.dumps(export))
|
|
|
|
|
|
def get_nodestatus(self, rawid):
|
|
|
"""Determine node's status."""
|