update - fixes

code/web/base/ga/subviews/system/update.py

@@ -1,6 +1,7 @@
 from django.shortcuts import render, redirect
 from django.contrib.auth.decorators import user_passes_test
 import requests
+from threading import Thread
 
 from core.utils.test import test_tcp_stream
 
@@ -89,7 +90,10 @@ def update_start(request, current_version):
                 f"ga_update_path_log={get_server_config(setting='path_log')}\n"
             )
 
-        web_subprocess(f'sudo systemctl start {config.UPDATE_SERVICE}.service --no-block')
+        def start():
+            web_subprocess(f'sudo systemctl start {config.UPDATE_SERVICE}.service')
+
+        Thread(target=start()).start()
         return redirect('/system/update/status/')
 
     except KeyError as error:
@@ -101,24 +105,22 @@ def update_status_view(request):
     status = 'Running'
     reload_time = 5
     redirect_time = 30
-    log_data = str_to_list(web_subprocess(config.LOG_SERVICE_LOG_STATUS % config.UPDATE_SERVICE))
+    log_data = str_to_list(web_subprocess(f"{config.LOG_SERVICE_LOG_STATUS % config.UPDATE_SERVICE} | grep ' {config.UPDATE_SERVICE}\\['"))
+    update_status = web_subprocess(command=f"systemctl is-active {config.UPDATE_SERVICE}.service")
 
-    if log_data[2].find('activating') == -1:
+    if update_status.find('activating') == -1:
         reload_time = 0
         redirect_time = 0
-        status = 'Finished'
-
-        if log_data[-3].find('Succeeded') != -1:
-            status = 'Finished successfully!'
+        status = 'Finished with unidentified result!'
 
-        elif log_data[2].find('failed') != -1:
-            status = 'Failed!'
+        for line in log_data[-6:-2]:
+            if line.find('Update failed') != -1:
+                status = 'Failed!'
+                break
 
-        else:
-            for line in log_data[-5:-2]:
-                if line.find('failed') != -1 or line.find('Failed') != -1:
-                    status = 'Failed'
-                    break
+            elif line.find('Update succeeded') != -1:
+                status = 'Finished successfully!'
+                break
 
     return render(request, 'system/update/status.html', context={
         'request': request, 'title': 'System Update Status', 'log_data': log_data, 'reload_time': reload_time, 'status': status, 'redirect_time': redirect_time,

code/web/base/ga/templates/info/update.html

@@ -0,0 +1,3 @@
+<div class="alert alert-info" id="downloadStarted" style="display:none;">
+    Update started - redirecting! (<i>this can take ~1 minute</i>)
+</div>

code/web/base/ga/templates/system/update/offline.html

@@ -14,5 +14,6 @@
         </div>
         <input type="hidden" name="type" value="offline" />
         {% include "../../btn/start.html" %}
+        {% include "../../info/update.html" %}
     </form>
 {% endblock %}

code/web/base/ga/templates/system/update/online.html

@@ -26,9 +26,7 @@
             {% include "../../btn/start.html" %}
         </form>
         <br>
-        <div class="alert alert-info" id="downloadStarted" style="display:none;">
-            Update download started!
-        </div>
+        {% include "../../info/update.html" %}
     {% else %}
         {% include "../../error/online_update.html" %}
     {% endif %}

code/web/base/ga/templates/system/update/status.html

@@ -21,10 +21,7 @@ <h2>Log data:</h2>
 <li class="ga-file-content-line">{{ line }}</li>
         {% endfor %}
     </ol>
-    <div class="alert alert-warning">
-        If the update fails hard you might need to read the update logs via:<br>
-        'journalctl -u ga_update.service --no-pager --full -n{LINECOUNT}'
-    </div>
+    {% include "../../warn/update_status.html" %}
     {% include "../../js/auto_reload.html" %}
     {% if redirect_time != 0 %}
         <script>

code/web/base/ga/templates/warn/update_status.html

@@ -0,0 +1,7 @@
+<br><br>
+<div class="alert alert-warning">
+    This update page might fail to load/time-out while updating.<br>
+    In that case => just refresh the page after some (<i>~1-5</i>) minutes.<br><br>
+    If the update fails hard you might need to read the update logs via:<br>
+    'journalctl -u ga_update.service --no-pager --full -n{LINECOUNT}'
+</div>

setup/roles/update/tasks/checks.yml

@@ -9,7 +9,7 @@
   ansible.builtin.set_fact:
     ga_remove_core_venv: true
   changed_when: false
-  when: ga_raw_core_venv_version.stdout|float < ga_python_version|float
+  when: ga_raw_core_venv_version.stdout is version(ga_python_version, '<')
 
 - name: Getting python-version of web-venv
   ansible.builtin.shell: "{{ ga_update_path_home_web }}/venv/bin/python3 --version | cut -d ' ' -f2"
@@ -20,4 +20,4 @@
   ansible.builtin.set_fact:
     ga_remove_web_venv: true
   changed_when: false
-  when: ga_raw_web_venv_version.stdout|float < ga_python_version|float
+  when: ga_raw_web_venv_version.stdout is version(ga_python_version, '<')