oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last block parsing confusion

Browse source
This commit is contained in:
HelloZeroNet 2016-04-07 12:29:34 +02:00
parent 1f612fa1b0
commit 915dd92b5a
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/Zeroname/updater/zeroname_updater.py
View file

@ -129,7 +129,7 @@ if not os.path.isfile(config_path): # Create sample config
open(config_path, "w").write( open(config_path, "w").write(
json.dumps({'site': 'site', 'zeronet_path': '/home/zeronet', 'privatekey': '', 'lastprocessed': 223910}, indent=2) json.dumps({'site': 'site', 'zeronet_path': '/home/zeronet', 'privatekey': '', 'lastprocessed': 223910}, indent=2)
) )
print "Example config written to %s" % config_path print "* Example config written to %s" % config_path
sys.exit(0) sys.exit(0)
config = json.load(open(config_path)) config = json.load(open(config_path))
@ -137,7 +137,7 @@ names_path = "%s/data/%s/data/names.json" % (config["zeronet_path"], config["sit
os.chdir(config["zeronet_path"]) # Change working dir - tells script where Zeronet install is. os.chdir(config["zeronet_path"]) # Change working dir - tells script where Zeronet install is.
# Parameters to sign and publish # Parameters to sign and publish
command_sign_publish = [sys.executable, "zeronet.py", "siteSign", "--publish", config["site"], config["privatekey"]] command_sign_publish = [sys.executable, "zeronet.py", "siteSign", config["site"], config["privatekey"], "--publish"]
if sys.platform == 'win32': if sys.platform == 'win32':
command_sign_publish = ['"%s"' % param for param in command_sign_publish] command_sign_publish = ['"%s"' % param for param in command_sign_publish]
@ -158,20 +158,28 @@ assert not processBlock(236752, test=True) # Uppercase domain (invalid should sk
assert processBlock(236870, test=True) # Encoded domain (should pass) assert processBlock(236870, test=True) # Encoded domain (should pass)
# sys.exit(0) # sys.exit(0)
print "- Parsing skipped blocks..."
should_publish = False
for block_id in range(config["lastprocessed"], last_block + 1):
if processBlock(block_id):
should_publish = True
config["lastprocessed"] = last_block
if should_publish:
publish()
while 1: while 1:
print "Waiting for new block" print "- Waiting for new block"
sys.stdout.flush() sys.stdout.flush()
while 1: while 1:
try: try:
rpc = AuthServiceProxy(rpc_auth, timeout=rpc_timeout) rpc = AuthServiceProxy(rpc_auth, timeout=rpc_timeout)
if (int(rpc.getinfo()["blocks"]) > config["lastprocessed"]):
break
time.sleep(1) time.sleep(1)
rpc.waitforblock() rpc.waitforblock()
print "Found" print "Found"
break # Block found break # Block found
except socket.timeout: # Timeout except socket.timeout: # Timeout
print "." print ".",
sys.stdout.flush() sys.stdout.flush()
except Exception, err: except Exception, err:
print "Exception", err.__class__, err print "Exception", err.__class__, err