From a2e4f6e4816d4f0d92888b577b76153cf8c65e19 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 22 Oct 2014 18:26:25 +0200 Subject: Host and port are now user agent switches, not depending on .pixelated file anymore --- service/pixelated/config/args.py | 10 +++++----- service/pixelated/runserver.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'service/pixelated') diff --git a/service/pixelated/config/args.py b/service/pixelated/config/args.py index 0e830e0a..93453075 100644 --- a/service/pixelated/config/args.py +++ b/service/pixelated/config/args.py @@ -20,12 +20,12 @@ import os def parse(): - default_config_path = os.path.join(os.environ['HOME'], '.pixelated') parser = argparse.ArgumentParser(description='Pixelated user agent.') - parser.add_argument('--debug', action='store_true', - help='DEBUG mode.') + 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('-c', '--config', metavar='configfile', default=default_config_path, - help='use specified config file. Default is ~/.pixelated.') + 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)') args = parser.parse_args() return args diff --git a/service/pixelated/runserver.py b/service/pixelated/runserver.py index 995796df..92266dba 100644 --- a/service/pixelated/runserver.py +++ b/service/pixelated/runserver.py @@ -43,7 +43,7 @@ def setup(): events_server.ensure_server(port=8090) - app.config.from_pyfile(args.config) + app.config.update({'HOST': args.host, 'PORT': args.port}) if args.register: server_name = app.config['LEAP_SERVER_NAME'] -- cgit v1.2.3