Quellcode durchsuchen

:wrench: add laravel schedule run timer

Jeremy Zheng vor 1 Jahr
Ursprung
Commit
d59326249a

+ 3 - 5
deploy/mint.yml

@@ -78,11 +78,9 @@
   hosts:
     - fort
   tasks:
-    - name: Start schedule run service
+    - name: Enable schedule run timer
       ansible.builtin.systemd_service:
-        name: "{{ app_container_prefix }}-{{ app_domain }}-worker-{{ item }}"
-        enabled: true
+        name: "{{ app_domain }}-scheduler.timer"
         state: restarted
+        enabled: true
         scope: user
-      loop:
-        - schedule-run

+ 5 - 5
deploy/roles/mint-v2.1/tasks/laravel.yml

@@ -47,11 +47,11 @@
   loop_control:
     loop_var: worker_name
 
-- name: Setup schedule run worker
-  ansible.builtin.include_tasks: workers.yml
-  vars:
-    zone_name: schedule
-    worker_name: run
+- name: Setup schedule run
+  ansible.builtin.import_tasks: schedule-run.yml
+
+- name: Setup php-fpm
+  ansible.builtin.import_tasks: php-fpm.yml
 
 - name: Create a current link
   ansible.builtin.file:

+ 0 - 3
deploy/roles/mint-v2.1/tasks/main.yml

@@ -27,9 +27,6 @@
 - name: Setup laravel
   ansible.builtin.import_tasks: laravel.yml
 
-- name: Setup php-fpm
-  ansible.builtin.import_tasks: php-fpm.yml
-
 - name: Force systemd to reread configs
   become: true
   ansible.builtin.systemd:

+ 11 - 0
deploy/roles/mint-v2.1/tasks/schedule-run.yml

@@ -0,0 +1,11 @@
+- name: Setup schedule run worker service
+  ansible.builtin.include_tasks: workers.yml
+  vars:
+    zone_name: schedule
+    worker_name: run
+
+- name: Setup schedule run worker timer
+  ansible.builtin.template:
+    src: containers/schedule-run.timer.j2
+    dest: "{{ ansible_env.HOME }}/.config/systemd/user/{{ app_domain }}-scheduler.timer"
+    mode: "0644"

+ 2 - 1
deploy/roles/mint-v2.1/tasks/workers.yml

@@ -25,4 +25,5 @@
       new: true
       names: true
       restart_policy: always
-      stop_timeout: 120
+      restart_sec: 30
+      stop_timeout: 20

+ 1 - 1
deploy/roles/mint-v2.0/templates/scheduler.timer.j2 → deploy/roles/mint-v2.1/templates/containers/schedule-run.timer.j2

@@ -4,7 +4,7 @@ Description=Runs Mint {{ app_domain }} scheduler every minute
 [Timer]
 OnBootSec=15minutes
 OnUnitActiveSec=1minute
-Unit=scheduler.{{ app_domain }}.service
+Unit={{ app_container_prefix }}-{{ app_domain }}-worker-schedule-run.service
 
 [Install]
 WantedBy=timers.target