From 53f98c34498028bbdc07b444b4f64c28b2bca02e Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Thu, 20 Dec 2018 14:24:46 -0600 Subject: [PATCH] more endpoints reimplemented in new api --- onionr/communicator2.py | 4 ++-- onionr/onionr.py | 5 +++-- onionr/onionrproofs.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/onionr/communicator2.py b/onionr/communicator2.py index fa14864e..15b0d047 100755 --- a/onionr/communicator2.py +++ b/onionr/communicator2.py @@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . ''' -import gevent.monkey -gevent.monkey.patch_all() +#import gevent.monkey +#gevent.monkey.patch_all() import sys, os, core, config, json, requests, time, logger, threading, base64, onionr, uuid import onionrexceptions, onionrpeers, onionrevents as events, onionrplugins as plugins, onionrblockapi as block import onionrdaemontools, onionrsockets, onionrchat, onionr, onionrproofs diff --git a/onionr/onionr.py b/onionr/onionr.py index 1d47972a..0493f1e4 100755 --- a/onionr/onionr.py +++ b/onionr/onionr.py @@ -20,8 +20,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . ''' -import gevent.monkey -gevent.monkey.patch_all() import sys if sys.version_info[0] == 2 or sys.version_info[1] < 5: print('Error, Onionr requires Python 3.5+') @@ -71,6 +69,9 @@ class Onionr: self.onionrCore = core.Core() self.onionrUtils = onionrutils.OnionrUtils(self.onionrCore) + self.clientAPIInst = '' # Client http api instance + self.publicAPIInst = '' # Public http api instance + # Handle commands self.debug = False # Whole application debugging diff --git a/onionr/onionrproofs.py b/onionr/onionrproofs.py index 9665a4cb..0bbfee6b 100644 --- a/onionr/onionrproofs.py +++ b/onionr/onionrproofs.py @@ -238,6 +238,7 @@ class POW: break else: time.sleep(2) + print('boi') except KeyboardInterrupt: self.shutdown() logger.warn('Got keyboard interrupt while waiting for POW result, stopping')