kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-19 12:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

verbose output when using the CLI

Browse Source
This commit is contained in:
Jude Nelson
2017-10-05 12:15:38 -04:00
parent e54dd15e32
commit 18ef1a5ac1
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
blockstack/lib/fast_sync.py
View File

@@ -22,6 +22,7 @@
"""
import os
import sys
import shutil
import tempfile
import base64
@@ -504,7 +505,7 @@ def fast_sync_inspect_snapshot( snapshot_path ):
return info
def fast_sync_import( working_dir, import_url, public_keys=config.FAST_SYNC_PUBLIC_KEYS, num_required=len(config.FAST_SYNC_PUBLIC_KEYS) ):
def fast_sync_import( working_dir, import_url, public_keys=config.FAST_SYNC_PUBLIC_KEYS, num_required=len(config.FAST_SYNC_PUBLIC_KEYS), verbose=False ):
"""
Fast sync import.
Verify the given fast-sync file from @import_path using @public_key, and then
@@ -514,17 +515,29 @@ def fast_sync_import( working_dir, import_url, public_keys=config.FAST_SYNC_PUBL
NOTE: `public_keys` needs to be in the same order as the private keys that signed.
"""
def logmsg(s):
if verbose:
print s
else:
log.debug(s)
def logerr(s):
if verbose:
print >> sys.stderr, s
else:
log.error(s)
if working_dir is None:
working_dir = virtualchain.get_working_dir()
if not os.path.exists(working_dir):
log.error("No such directory {}".format(working_dir))
logerr("No such directory {}".format(working_dir))
return False
# go get it
import_path = fast_sync_fetch(import_url)
if import_path is None:
log.error("Failed to fetch {}".format(import_url))
logerr("Failed to fetch {}".format(import_url))
return False
# format: <signed bz2 payload> <sigb64> <sigb64 length (8 bytes hex)> ... <num signatures>
@@ -543,7 +556,7 @@ def fast_sync_import( working_dir, import_url, public_keys=config.FAST_SYNC_PUBL
with open(import_path, 'r') as f:
info = fast_sync_inspect( f )
if 'error' in info:
log.error("Failed to inspect snapshot {}: {}".format(import_path, info['error']))
logerr("Failed to inspect snapshot {}: {}".format(import_path, info['error']))
return False
signatures = info['signatures']
@@ -553,7 +566,7 @@ def fast_sync_import( working_dir, import_url, public_keys=config.FAST_SYNC_PUBL
hash_hex = get_file_hash(f, hashlib.sha256, fd_len=ptr)
# validate signatures over the hash
log.debug("Verify {} bytes".format(ptr))
logmsg("Verify {} bytes".format(ptr))
key_idx = 0
num_match = 0
for next_pubkey in public_keys:
@@ -564,32 +577,32 @@ def fast_sync_import( working_dir, import_url, public_keys=config.FAST_SYNC_PUBL
if num_match >= num_required:
break
log.debug("Public key {} matches {} ({})".format(next_pubkey, sigb64, hash_hex))
logmsg("Public key {} matches {} ({})".format(next_pubkey, sigb64, hash_hex))
signatures.remove(sigb64)
else:
log.debug("Public key {} does NOT match {} ({})".format(next_pubkey, sigb64, hash_hex))
logmsg("Public key {} does NOT match {} ({})".format(next_pubkey, sigb64, hash_hex))
# enough signatures?
if num_match < num_required:
log.error("Not enough signatures match (required {}, found {})".format(num_required, num_match))
logerr("Not enough signatures match (required {}, found {})".format(num_required, num_match))
return False
# decompress
import_path = os.path.abspath(import_path)
res = fast_sync_snapshot_decompress(import_path, working_dir)
if 'error' in res:
log.error("Failed to decompress {} to {}: {}".format(import_path, working_dir, res['error']))
logerr("Failed to decompress {} to {}: {}".format(import_path, working_dir, res['error']))
return False
# restore from backup
rc = blockstack_backup_restore(working_dir, None)
if not rc:
log.error("Failed to instantiate blockstack name database")
logerr("Failed to instantiate blockstack name database")
return False
# success!
log.debug("Restored to {}".format(working_dir))
logmsg("Restored to {}".format(working_dir))
return True