From 6b1649941bdd2cfbb9912d0fee8a86c67a9021f9 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Fri, 21 Feb 2020 10:56:36 +0000 Subject: [PATCH] Client: Fix responce id --- Drone/client.py | 2 ++ Drone/copter_client.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Drone/client.py b/Drone/client.py index ff293c2..c7aaf45 100644 --- a/Drone/client.py +++ b/Drone/client.py @@ -51,6 +51,8 @@ class Client(object): self.client_id = socket.gethostname() elif config_id == '/ip': self.client_id = messaging.get_ip_address() + else: + self.client_id = config_id logger.info("Config loaded") diff --git a/Drone/copter_client.py b/Drone/copter_client.py index 1aa9797..150e694 100644 --- a/Drone/copter_client.py +++ b/Drone/copter_client.py @@ -252,14 +252,15 @@ def _response_id(*args, **kwargs): old_id = client.active_client.client_id if new_id != old_id: client.active_client.config.set('PRIVATE', 'id', new_id, write=True) + client.active_client.client_id = new_id if new_id != '/hostname': - if client.active_client.system_restart_after_rename: + if client.active_client.config.system_restart_after_rename: hostname = client.active_client.client_id configure_hostname(hostname) configure_hosts(hostname) configure_bashrc(hostname) configure_motd(hostname) - execute_command("reboot") + execute_command("systemctl stop clever-show & reboot") # execute_command("hostname {}".format(hostname)) # restart_service("dhcpcd") # restart_service("avahi-daemon")