diff options
author | Bruno Wagner <bwagner@thoughtworks.com> | 2014-10-22 23:28:06 +0200 |
---|---|---|
committer | Bruno Wagner <bwagner@thoughtworks.com> | 2014-10-22 23:28:20 +0200 |
commit | 71c97b0eca6efd58b2b1a83f16e2629d0e091788 (patch) | |
tree | 3a4e6bde6d0c4c5e9153d3a1470c6a4c3da671c4 | |
parent | 17cd4e45a3f2d09d4ea43cda536e32ca13299234 (diff) |
Fixed register after latest changes to runner, the format is pixelated-user-agent --register <provider> <username> now
-rw-r--r-- | service/pixelated/config/args.py | 2 | ||||
-rw-r--r-- | service/pixelated/runserver.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/service/pixelated/config/args.py b/service/pixelated/config/args.py index 93453075..4ab95835 100644 --- a/service/pixelated/config/args.py +++ b/service/pixelated/config/args.py @@ -23,9 +23,9 @@ def parse(): parser = argparse.ArgumentParser(description='Pixelated user agent.') parser.add_argument('--debug', action='store_true', help='DEBUG mode.') parser.add_argument('--dispatcher', action='store_true', help='run in organization mode, the credentials will be received from the dispatcher this way') - parser.add_argument('--register', metavar='username', help='register user with name.') parser.add_argument('--host', default='127.0.0.1', help='the host to run the user agent on') parser.add_argument('--port', type=int, default=3333, help='the port to run the user agent on') parser.add_argument('-c', '--config', metavar='configfile', default=None, help='use specified file for credentials (for test purposes only)') + parser.add_argument('--register', nargs=2, help='register on the following provider with provided username.') args = parser.parse_args() return args diff --git a/service/pixelated/runserver.py b/service/pixelated/runserver.py index 0146c4b7..49ad0067 100644 --- a/service/pixelated/runserver.py +++ b/service/pixelated/runserver.py @@ -48,10 +48,9 @@ def setup(): app.config.update({'HOST': args.host, 'PORT': args.port}) if args.register: - server_name = app.config['LEAP_SERVER_NAME'] - leap_register.register_new_user(args.register, server_name) + server_name, username = args.register + leap_register.register_new_user(username, server_name) else: - if args.dispatcher: raise Exception('Dispatcher mode not implemented yet') elif args.config is not None: |