Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
d244b1ba77 | ||
|
b8a74fac97 |
@ -18,8 +18,8 @@ conf['general']['display_header'] = True
|
|||||||
conf['general']['security_level'] = 0
|
conf['general']['security_level'] = 0
|
||||||
conf['general']['use_bootstrap_list'] = True
|
conf['general']['use_bootstrap_list'] = True
|
||||||
conf['onboarding']['done'] = False
|
conf['onboarding']['done'] = False
|
||||||
conf['general']['minimum_block_pow'] = 6
|
conf['general']['minimum_block_pow'] = 5
|
||||||
conf['general']['minimum_send_pow'] = 6
|
conf['general']['minimum_send_pow'] = 5
|
||||||
conf['log']['file']['remove_on_exit'] = True
|
conf['log']['file']['remove_on_exit'] = True
|
||||||
conf['transports']['lan'] = True
|
conf['transports']['lan'] = True
|
||||||
conf['transports']['tor'] = True
|
conf['transports']['tor'] = True
|
||||||
|
@ -91,10 +91,17 @@ class SubprocessPOW:
|
|||||||
def _spawn_proc(self):
|
def _spawn_proc(self):
|
||||||
"""Create a child proof of work process
|
"""Create a child proof of work process
|
||||||
wait for data and send shutdown signal when its found"""
|
wait for data and send shutdown signal when its found"""
|
||||||
parent_conn, child_conn = Pipe()
|
# The importerror started happening in 3.9.x
|
||||||
p = Process(target=self.do_pow, args=(child_conn,), daemon=True)
|
# not worth fixing because this POW will be replaced by VDF
|
||||||
p.start()
|
try:
|
||||||
#p.join()
|
parent_conn, child_conn = Pipe()
|
||||||
|
p = Process(target=self.do_pow, args=(child_conn,), daemon=True)
|
||||||
|
p.start()
|
||||||
|
except ImportError:
|
||||||
|
logger.error(
|
||||||
|
"Error in subprocess module when getting new POW " +
|
||||||
|
"pipe.\nThis is related to a problem in 3.9.x", terminal=True)
|
||||||
|
return
|
||||||
payload = None
|
payload = None
|
||||||
try:
|
try:
|
||||||
while True:
|
while True:
|
||||||
|
@ -63,6 +63,6 @@ def sneakernet_import_thread():
|
|||||||
for path in watch_paths:
|
for path in watch_paths:
|
||||||
observer.schedule(_Importer(), path, recursive=True)
|
observer.schedule(_Importer(), path, recursive=True)
|
||||||
observer.start()
|
observer.start()
|
||||||
while observer.isAlive():
|
while observer.is_alive():
|
||||||
# call import func with timeout
|
# call import func with timeout
|
||||||
observer.join(60)
|
observer.join(60)
|
||||||
|
@ -77,4 +77,4 @@
|
|||||||
"public_remote_hosts": [],
|
"public_remote_hosts": [],
|
||||||
"theme": "dark"
|
"theme": "dark"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -30,8 +30,8 @@ class OnionrConfig(unittest.TestCase):
|
|||||||
self.assertEqual(conf['general']['ephemeral_tunnels'], False)
|
self.assertEqual(conf['general']['ephemeral_tunnels'], False)
|
||||||
self.assertEqual(conf['general']['hide_created_blocks'], True)
|
self.assertEqual(conf['general']['hide_created_blocks'], True)
|
||||||
self.assertEqual(conf['general']['insert_deniable_blocks'], True)
|
self.assertEqual(conf['general']['insert_deniable_blocks'], True)
|
||||||
self.assertEqual(conf['general']['minimum_block_pow'], 6)
|
self.assertEqual(conf['general']['minimum_block_pow'], 5)
|
||||||
self.assertEqual(conf['general']['minimum_send_pow'], 6)
|
self.assertEqual(conf['general']['minimum_send_pow'], 5)
|
||||||
self.assertEqual(conf['general']['public_key'], '')
|
self.assertEqual(conf['general']['public_key'], '')
|
||||||
self.assertEqual(conf['general']['random_bind_ip'], True)
|
self.assertEqual(conf['general']['random_bind_ip'], True)
|
||||||
self.assertEqual(conf['general']['security_level'], 0)
|
self.assertEqual(conf['general']['security_level'], 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user