summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlejeune quentin <qle@odoo.com>2020-02-24 13:19:09 +0000
committerlejeune quentin <qle@odoo.com>2020-02-24 16:03:12 +0000
commitfff277a4a7af950d6ec18d09d2533d95b40a2d70 (patch)
treecbcc59dfad21c5f40600860388087a5b44795cca
parent1744878573efde37ecab16afe8b391403fee292a (diff)
[FIX] hw_drivers: Do not send request if the IoT is in access point
If IoT Box is in access point mode and a server is configured the box try to reach the server. But in access point mode all requests are redirected to the box So now before return True in function 'get_odoo_server_url' we verify if the service 'hostapd' is inactive closes odoo/odoo#46141 X-original-commit: 365f0e384630bad16e0872d2307702fca5a4e295 Signed-off-by: Quentin Lejeune (qle) <qle@odoo.com>
-rwxr-xr-xaddons/hw_drivers/controllers/driver.py2
-rw-r--r--addons/hw_drivers/tools/helpers.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/addons/hw_drivers/controllers/driver.py b/addons/hw_drivers/controllers/driver.py
index ed3e8e6d091..e29f1c884b6 100755
--- a/addons/hw_drivers/controllers/driver.py
+++ b/addons/hw_drivers/controllers/driver.py
@@ -77,7 +77,7 @@ class StatusController(http.Controller):
"""
server = helpers.get_odoo_server_url()
image = get_resource_path('hw_drivers', 'static/img', 'False.jpg')
- if server == '':
+ if not server:
credential = b64decode(token).decode('utf-8').split('|')
url = credential[0]
token = credential[1]
diff --git a/addons/hw_drivers/tools/helpers.py b/addons/hw_drivers/tools/helpers.py
index d69065c4502..f59de214d9d 100644
--- a/addons/hw_drivers/tools/helpers.py
+++ b/addons/hw_drivers/tools/helpers.py
@@ -134,6 +134,9 @@ def get_ssid():
return subprocess.check_output(['sed', 's/.*"\\(.*\\)"/\\1/'], stdin=process_grep.stdout).decode('utf-8').rstrip()
def get_odoo_server_url():
+ ap = subprocess.call(['systemctl', 'is-active', 'hostapd']) # if service is active return 0 else inactive
+ if not ap:
+ return False
return read_file_first_line('odoo-remote-server.conf')
def get_token():