afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into coretk-enhance/disable-editing-during-runtime

Browse source
This commit is contained in:
Huy Pham 2020-02-25 11:39:50 -08:00
commit 41bb951531
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/api/grpc/grpcutils.py
View file

@ -377,7 +377,7 @@ def service_configuration(session: Session, config: core_pb2.ServiceConfig) -> N
session.services.set_service(config.node_id, config.service)
service = session.services.get_service(config.node_id, config.service)
if config.files:
service.files = tuple(config.files)
service.configs = tuple(config.files)
if config.directories:
service.directories = tuple(config.directories)
if config.startup:

4
daemon/core/gui/task.py
View file

@ -22,8 +22,8 @@ class BackgroundTask:
result = self.task(*self.args)
logging.info("task completed")
# if start session fails, a response with Result: False and a list of exceptions is returned
if hasattr(result, "result") and not result.result:
if hasattr(result, "exceptions") and len(result.exceptions) > 0:
if not getattr(result, "result", True):
if len(getattr(result, "exceptions", [])) > 0:
self.master.after(
0,
show_grpc_response_exceptions,