equal
deleted
inserted
replaced
590 except Exception: |
590 except Exception: |
591 LogMessageAndException(_("Nevow/Athena import failed :")) |
591 LogMessageAndException(_("Nevow/Athena import failed :")) |
592 webport = None |
592 webport = None |
593 NS.WorkingDir = WorkingDir |
593 NS.WorkingDir = WorkingDir |
594 |
594 |
595 # Find pre-existing project WAMP config file |
595 try: |
596 _wampconf = os.path.join(WorkingDir, "wampconf.json") |
596 import runtime.WampClient as WC # pylint: disable=ungrouped-imports |
597 |
597 WC.WorkingDir = WorkingDir |
598 # If project's WAMP config file exits, override default (-c) |
598 except Exception: |
599 if os.path.exists(_wampconf): |
599 LogMessageAndException(_("WAMP import failed :")) |
600 wampconf = _wampconf |
|
601 |
|
602 if wampconf is not None: |
|
603 try: |
|
604 import runtime.WampClient as WC # pylint: disable=ungrouped-imports |
|
605 except Exception: |
|
606 LogMessageAndException(_("WAMP import failed :")) |
|
607 wampconf = None |
|
608 |
600 |
609 # Load extensions |
601 # Load extensions |
610 for extention_file, extension_folder in extensions: |
602 for extention_file, extension_folder in extensions: |
611 sys.path.append(extension_folder) |
603 sys.path.append(extension_folder) |
612 execfile(os.path.join(extension_folder, extention_file), locals()) |
604 execfile(os.path.join(extension_folder, extention_file), locals()) |
619 NS.SetServer(pyroserver) |
611 NS.SetServer(pyroserver) |
620 statuschange.append(NS.website_statuslistener_factory(website)) |
612 statuschange.append(NS.website_statuslistener_factory(website)) |
621 except Exception: |
613 except Exception: |
622 LogMessageAndException(_("Nevow Web service failed. ")) |
614 LogMessageAndException(_("Nevow Web service failed. ")) |
623 |
615 |
624 if wampconf is not None: |
616 try: |
625 try: |
617 WC.SetServer(pyroserver) |
626 WC.SetServer(pyroserver) |
618 WC.RegisterWampClient(wampconf, wampsecret) |
627 WC.RegisterWampClient(wampconf, wampsecret) |
619 except Exception: |
628 except Exception: |
620 LogMessageAndException(_("WAMP client startup failed. ")) |
629 LogMessageAndException(_("WAMP client startup failed. ")) |
|
630 |
621 |
631 pyro_thread_started = Lock() |
622 pyro_thread_started = Lock() |
632 pyro_thread_started.acquire() |
623 pyro_thread_started.acquire() |
633 pyro_thread = Thread(target=pyroserver.PyroLoop, |
624 pyro_thread = Thread(target=pyroserver.PyroLoop, |
634 kwargs=dict(when_ready=pyro_thread_started.release)) |
625 kwargs=dict(when_ready=pyro_thread_started.release)) |