diff options
Diffstat (limited to 'fab_update_user.py')
| -rwxr-xr-x | fab_update_user.py | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/fab_update_user.py b/fab_update_user.py index 1e84909..8d8440c 100755 --- a/fab_update_user.py +++ b/fab_update_user.py @@ -121,32 +121,6 @@ def get_user_histories(verified): pmig.close() return [util.translate_json_dict_items(d) for d in histories] -def get_verified_users(modtime, limit=None): - #Find the task in new Phabricator that matches our lookup - verified = phabdb.get_verified_emails(modtime=modtime, limit=limit) - create_times = [v[2] for v in verified] - try: - newest = max(create_times) - except ValueError: - newest = modtime - return verified, newest - -def get_verified_user(email): - phid, email, is_verified = phabdb.get_user_email_info(email) - log("Single verified user: %s, %s, %s" % (phid, email, is_verified)) - if is_verified: - return [(phid, email)] - else: - log("%s is not a verified email" % (email,)) - return [()] - -def last_finish(): - pmig = phabdb.phdb(db=config.fabmigrate_db, - user=config.fabmigrate_user, - passwd=config.fabmigrate_passwd) - pmig.close() - ftime = phabdb.get_user_relations_last_finish(pmig) - return ftime or 1 def main(): parser = argparse.ArgumentParser(description='Updates user metadata from fab') @@ -162,13 +136,13 @@ def main(): if args.a: starting_epoch = phabdb.get_user_relations_last_finish(pmig) - users, finish_epoch = get_verified_users(starting_epoch, config.fab_limit) + users, finish_epoch = phabdb.get_verified_users(starting_epoch, config.fab_limit) elif args.email: - users = get_verified_user(args.email) + users = phabdb.get_verified_user(args.email) starting_epoch = 0 finish_epoch = 0 elif args.starting_epoch: - users, finish_epoch = get_verified_users(args.starting_epoch) + users, finish_epoch = phabdb.get_verified_users(args.starting_epoch) starting_epoch = args.starting_epoch else: parser.print_help() @@ -200,13 +174,15 @@ def main(): log("Existing as there are no new verified users") sys.exit() - pid = os.getpid() + source = util.source_name(sys.argv[0]) phabdb.user_relations_start(pid, + source, int(time.time()), - 0, + ipriority['na'], starting_epoch, user_count, issue_count, pmig) + from multiprocessing import Pool pool = Pool(processes=config.fab_multi) _ = pool.map(run_update, histories) @@ -219,6 +195,10 @@ def main(): complete, failed, pmig) + + pm = phabmacros(config.phab_user, config.phab_cert, config.phab_host) + vlog(util.update_blog(source, complete, failed, user_count, issue_count, pm)) + print '%s completed %s, failed %s' % (sys.argv[0], complete, failed) pmig.close() |