M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

dashboard: store separate configuration data for each master, keyed by server and port

This commit is contained in:
Chris Ballance 2017-11-25 00:05:44 +00:00 committed by Sébastien Bourdeauducq
parent cfb41e71a8
commit 2852e793ab
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/frontend/artiq_dashboard.py
View File

@ -21,9 +21,6 @@ from artiq.dashboard import (experiments, shortcuts, explorer,
def get_argparser(): def get_argparser():
default_db_file = os.path.join(get_user_config_dir(),
"artiq_dashboard.pyon")
parser = argparse.ArgumentParser(description="ARTIQ Dashboard") parser = argparse.ArgumentParser(description="ARTIQ Dashboard")
parser.add_argument( parser.add_argument(
"-s", "--server", default="::1", "-s", "--server", default="::1",
@ -38,9 +35,8 @@ def get_argparser():
"--port-broadcast", default=1067, type=int, "--port-broadcast", default=1067, type=int,
help="TCP port to connect to for broadcasts") help="TCP port to connect to for broadcasts")
parser.add_argument( parser.add_argument(
"--db-file", default=default_db_file, "--db-file", default=None,
help="database file for local GUI settings " help="database file for local GUI settings")
"(default: %(default)s)")
verbosity_args(parser) verbosity_args(parser)
return parser return parser
@ -93,6 +89,12 @@ def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
widget_log_handler = log.init_log(args, "dashboard") widget_log_handler = log.init_log(args, "dashboard")
if args.db_file is None:
args.db_file = os.path.join(get_user_config_dir(),
"artiq_dashboard_{server}_{port}.pyon".format(
server=args.server.replace(":","."),
port=args.port_notify))
app = QtWidgets.QApplication(["ARTIQ Dashboard"]) app = QtWidgets.QApplication(["ARTIQ Dashboard"])
loop = QEventLoop(app) loop = QEventLoop(app)
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)