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

master: style (NFC)

This commit is contained in:
Chris Ballance 2017-11-25 11:45:05 +00:00 committed by Sébastien Bourdeauducq
parent 00efb0ccd2
commit b6ad510007
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq/frontend/artiq_master.py
View File

@ -55,6 +55,14 @@ def get_argparser():
return parser return parser
class MasterConfig:
def __init__(self, name):
self.name = name
def get_name(self):
return self.name
def main(): def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
log_forwarder = init_log(args) log_forwarder = init_log(args)
@ -98,11 +106,7 @@ def main():
scheduler.start() scheduler.start()
atexit_register_coroutine(scheduler.stop) atexit_register_coroutine(scheduler.stop)
class MasterConfig: config = MasterConfig(args.name)
def get_name(self):
return args.name
config = MasterConfig()
worker_handlers.update({ worker_handlers.update({
"get_device_db": device_db.get_device_db, "get_device_db": device_db.get_device_db,
@ -119,11 +123,11 @@ def main():
experiment_db.scan_repository_async() experiment_db.scan_repository_async()
server_control = RPCServer({ server_control = RPCServer({
"master_config": config,
"master_device_db": device_db, "master_device_db": device_db,
"master_dataset_db": dataset_db, "master_dataset_db": dataset_db,
"master_schedule": scheduler, "master_schedule": scheduler,
"master_experiment_db": experiment_db, "master_experiment_db": experiment_db
"master_config": config
}, allow_parallel=True) }, allow_parallel=True)
loop.run_until_complete(server_control.start( loop.run_until_complete(server_control.start(
bind, args.port_control)) bind, args.port_control))