kev
/
Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

progress removing onionr.py

This commit is contained in:
Kevin Froman 2019-08-05 11:30:19 -05:00
parent cbe10f914a
commit 6bf8bb1db6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
onionr/apiservers/private/__init__.py
View File

@ -41,7 +41,6 @@ class PrivateAPI:
This also saves the used host (random localhost IP address) to the data folder in host.txt
'''
self.config = config
self.serializer = serializeddata.SerializedData()
self.startTime = epoch.get_epoch()
app = flask.Flask(__name__)
bindPort = int(config.get('client.client.port', 59496))

14
onionr/httpapi/fdsafehandler.py
View File

@ -7,15 +7,17 @@ class FDSafeHandler(WSGIHandler):
self.timeout.start()
try:
WSGIHandler.handle(self)
except Exception as e:
self.handle_error(e)
finally:
self.timeout.close()
except gevent.Timeout as ex:
if ex is self.timeout:
pass
else:
raise
'''
def handle_error(self, two, three, four):
if two is self.timeout:
self.result = [b"Timeout"]
self.start_response("200 OK", [])
self.process_result()
else:
WSGIHandler.handle_error(self)
WSGIHandler.handle_error(self)
'''

2
onionr/httpapi/miscclientapi/endpoints.py
View File

@ -116,4 +116,4 @@ class PrivateEndpoints:
@private_endpoints_bp.route('/gettorsocks')
def get_tor_socks():
return Response(client_api._too_many.get(NetController).socksPort)
return Response(str(client_api._too_many.get(NetController).socksPort))

1
onionr/onionrblocks/insert.py
View File

@ -144,5 +144,4 @@ def insert_block(data, header='txt', sign=False, encryptType='', symKey='', asym
events.event('insertdeniable', {'content': plaintext, 'meta': plaintextMeta, 'hash': retData, 'peer': bytesconverter.bytes_to_str(asymPeer)}, threaded = True)
else:
events.event('insertblock', {'content': plaintext, 'meta': plaintextMeta, 'hash': retData, 'peer': bytesconverter.bytes_to_str(asymPeer)}, threaded = True)
return retData