diff options
author | Folker Bernitt <fbernitt@thoughtworks.com> | 2014-11-06 16:46:38 +0100 |
---|---|---|
committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2014-11-06 16:46:38 +0100 |
commit | 46692d1994ab83a0def7bd24f02efa0eaa130871 (patch) | |
tree | 3a871bce56bf400fbdd65a3b85f0175bfc557981 /service/pixelated/config | |
parent | 73f931813b54bafa9c70d88068c13dfcb804288b (diff) |
Issue #100: Read credentials from pipe.
Diffstat (limited to 'service/pixelated/config')
-rw-r--r-- | service/pixelated/config/app_factory.py | 4 | ||||
-rw-r--r-- | service/pixelated/config/args.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index bbc29527..c479a913 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -86,8 +86,8 @@ def init_leap_session(app): except ConnectionError, error: print("Can't connect to the requested provider") sys.exit(1) - except LeapAuthException: - print("Couldn't authenticate with the credentials provided") + except LeapAuthException, e: + print("Couldn't authenticate with the credentials provided %s" % e.message) sys.exit(1) return leap_session diff --git a/service/pixelated/config/args.py b/service/pixelated/config/args.py index 9b75a04b..6b77f341 100644 --- a/service/pixelated/config/args.py +++ b/service/pixelated/config/args.py @@ -20,7 +20,7 @@ import argparse 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('--dispatcher', help='run in organization mode, the credentials will be read from specified file', metavar='file') 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)') |