sync for dev 033026 after debugging

files/api/app.py

@@ -456,10 +456,20 @@ if __name__ == '__main__':
         log_data(log_output = f"New Cosmostat serverobject name: {new_server.name}", log_level = "log_output")
         return new_server
 
+    def update_local_system():
+        result = False
+        if cosmostat_client.check_system_timer():
+            result = True
+        if run_cosmostat_server():
+            result = True
+        if run_cosmostat_reporter() and int(time.time()) % 5 == 0:
+            result = True
+        return result
+
     # Background Loop Function
     def background_loop():
         # Update all data on the local System object
-        if cosmostat_client.check_system_timer() or run_cosmostat_server():
+        if update_local_system():
             cosmostat_client.update_system_state()
 
         # publish to redis if the web dashboard is active locally
@@ -468,8 +478,7 @@ if __name__ == '__main__':
         
         # report data to the server if configured
         if run_cosmostat_reporter():
-            if int(time.time()) % 5 == 0 and not cosmostat_client.check_system_timer():
+            if cosmostat_client.check_system_timer or int(time.time()) % 5 == 0:
-                cosmostat_client.update_system_state()
                 client_update()
 
         # if this is the server, do this stuff

tasks/main.yaml

@@ -13,7 +13,7 @@
 
 # set up API
 - name: Build API
-  when: false
+#  when: false
   include_tasks: api.yaml
 
 # set up web stack 

tasks/web.yaml

@@ -3,47 +3,47 @@
 # This part sets up cosmostat web dashboard
 ###############################################
 
-#- name: Cosmostat - Web - stop containers
+- name: Cosmostat - Web - stop containers
-#  community.docker.docker_compose_v2:
+  community.docker.docker_compose_v2:
-#    project_src: "{{ service_control_docker_folder }}"
+    project_src: "{{ service_control_docker_folder }}"
-#    state: stopped
+    state: stopped
-#  ignore_errors: yes
+  ignore_errors: yes
 
 # Create web Folder
-#- name: "Cosmostat - Web - create {{ service_control_web_folder }}"
+- name: "Cosmostat - Web - create {{ service_control_web_folder }}"
-#  file:
+  file:
-#    path: "{{ service_control_web_folder }}"
+    path: "{{ service_control_web_folder }}"
-#    state: directory
+    state: directory
-#    mode: '0755' 
+    mode: '0755' 
-#    owner: "{{ service_user }}"
-#    group: "{{ service_user }}"
-
-- name: Cosmostat - Web - copy docker files
-  copy:
-    src: "docker/"
-    dest: "{{ service_control_docker_folder }}"
-    mode: 0755    
     owner: "{{ service_user }}"
     group: "{{ service_user }}"
 
+#- name: Cosmostat - Web - copy docker files
+#  copy:
+#    src: "docker/"
+#    dest: "{{ service_control_docker_folder }}"
+#    mode: 0755    
+#    owner: "{{ service_user }}"
+#    group: "{{ service_user }}"
+
 - name: Cosmostat - Web - copy web files
   copy:
     src: "web/"
-    dest: "{{ service_control_docker_folder }}/web"
+    dest: "{{ service_control_web_folder }}/"
     mode: 0755    
     owner: "{{ service_user }}"
     group: "{{ service_user }}"
     
 - name: Cosmostat - Web - template docker-compose.yaml
   template:
-    src: docker-compose-single.yaml
+    src: docker-compose-php.yaml
-    dest: "{{ service_control_docker_folder }}/docker-compose.yaml"
+    dest: "{{ service_control_web_folder }}/docker-compose.yaml"
     mode: 0644
 
 - name: "Cosmostat - Web - template cosmostat_settings.yaml"
   template:
     src: cosmostat_settings.yaml
-    dest: "{{ service_control_docker_folder }}/cosmostat_settings.yaml"
+    dest: "{{ service_control_web_folder }}/cosmostat_settings.yaml"
     owner: "{{ service_user }}"
     group: "{{ service_user }}"
     mode: 0644
@@ -54,13 +54,13 @@
   when: cosmostat_server | bool
   include_tasks: server.yaml
 
-#- name: Cosmostat - Web - Start containers
+- name: Cosmostat - Web - Start containers
-#  community.docker.docker_compose_v2:
+  community.docker.docker_compose_v2:
-#    project_src: "{{ service_control_web_folder }}"
+    project_src: "{{ service_control_web_folder }}"
-#    state: present
+    state: present
-#  register: docker_output
+  register: docker_output
-#- debug: |
+- debug: |
-#          msg="{{ docker_output.actions }}"
+          msg="{{ docker_output.actions }}"
 
 
 ...