dm-ansible: Make sure stdout is outputted (#210)

pingcap · Jul 22, 2019 · 4a7b841 · 4a7b841
1 parent 1eecb0d
commit 4a7b841
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/dm/dm-ansible/roles/dm-master/defaults/main.yml b/dm/dm-ansible/roles/dm-master/defaults/main.yml
@@ -5,4 +5,5 @@
 dm_master_log_level: "info"
 dm_master_log_dir: "{{ deploy_dir }}/log"
 dm_master_log_file: "dm-master.log"
+dm_master_stdout_log_file: "dm-master-stdout.log"
 dm_master_stderr_log_file: "dm-master-stderr.log"
diff --git a/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2 b/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2
@@ -12,4 +12,4 @@ exec bin/dm-master \
     --master-addr=":{{ dm_master_port }}" \
     -L="{{ dm_master_log_level }}" \
     --config="conf/dm-master.toml" \
-    --log-file="{{ dm_master_log_dir }}/{{ dm_master_log_file }}" 2>> "{{ dm_master_log_dir }}/{{ dm_master_stderr_log_file }}"
+    --log-file="{{ dm_master_log_dir }}/{{ dm_master_log_file }}" >> "{{ dm_master_log_dir }}/{{ dm_master_stdout_log_file }}" 2>> "{{ dm_master_log_dir }}/{{ dm_master_stderr_log_file }}"
diff --git a/dm/dm-ansible/roles/dm-worker/defaults/main.yml b/dm/dm-ansible/roles/dm-worker/defaults/main.yml
@@ -5,5 +5,6 @@
 dm_worker_log_level: "info"
 dm_worker_log_dir: "{{ deploy_dir }}/log"
 dm_worker_log_file: "dm-worker.log"
+dm_worker_stdout_log_file: "dm-worker-stdout.log"
 dm_worker_stderr_log_file: "dm-worker-stderr.log"
 dm_worker_relay_dir: "{{ deploy_dir }}/relay_log"
diff --git a/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2 b/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2
@@ -13,4 +13,4 @@ exec bin/dm-worker \
     -L="{{ dm_worker_log_level }}" \
     --relay-dir="{{ dm_worker_relay_dir }}" \
     --config="conf/dm-worker.toml" \
-    --log-file="{{ dm_worker_log_dir }}/{{ dm_worker_log_file }}"  2>> "{{ dm_worker_log_dir }}/{{ dm_worker_stderr_log_file }}"
+    --log-file="{{ dm_worker_log_dir }}/{{ dm_worker_log_file }}" >> "{{ dm_worker_log_dir }}/{{ dm_worker_stdout_log_file }}" 2>> "{{ dm_worker_log_dir }}/{{ dm_worker_stderr_log_file }}"