gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:修改sapp和certstore的minidump生成的路径

Browse Source
This commit is contained in:
fumingwei
2021-07-28 10:59:32 +08:00
parent 8dd23dfda9
commit 06bffe2143
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/certstore/templates/cert_store.conf.j2 Normal file
View File

@@ -0,0 +1,6 @@
#Type Path Mode User Group Age Argument
d /var/log/certstore/ 0755 - - 7d -
d /run/certstore/foreign_files 0755 - - - -
d /run/certstore/crashreport 0755 - - 30d -
L /opt/tsg/certstore/logs - - - - /var/log/certstore
L /opt/tsg/certstore/foreign_files - - - - /run/certstore/foreign_files

4
ansible/roles/certstore/templates/cert_store.ini.j2.j2
View File

@@ -4,8 +4,6 @@ DEBUG_SWITCH = 1
RUN_LOG_PATH = "conf/zlog.conf"
[breakpad]
{% raw %}breakpad_upload_url= {{ sentry_url }}
{% endraw %}
{% raw %}{% if coredump.format == 'none' %}
disable_coredump=1
enable_breakpad=0
@@ -28,7 +26,7 @@ RUN_LOG_PATH = "conf/zlog.conf"
{% endif %}
{% endif %}
{% endraw %}
breakpad_minidump_dir="/tmp/crashreport"
breakpad_minidump_dir="/run/certstore/crashreport "
[CONFIG]
#Number of running threads
thread-nu = 4

4
ansible/roles/sapp/templates/sapp.toml.j2.j2
View File

@@ -207,14 +207,14 @@ dictator_enable=1
enable_breakpad=1
{% if coredump.collect == 'sentry' %}
enable_breakpad_upload=1
breakpad_upload_url={{ coredump.sentry_url }}
breakpad_upload_url="{{ coredump.sentry_url }}"
{% endif %}
{% if coredump.collect == 'local' %}
enable_breakpad_upload=0
{% endif %}
{% endif %}
{% endraw %}
breakpad_minidump_dir="/tmp/crashreport"
breakpad_minidump_dir="/run/sapp/crashreport"
### note:
### These configurations format is complex and difficult to describe with toml grammar,

1
ansible/roles/sapp/templates/sapp_tmpfile.conf.j2
View File

@@ -1,5 +1,6 @@
#Type Path Mode User Group Age Argument
d /var/log/sapp/ 0755 - - 2d -
d /run/sapp/alerts_files/ 0755 - - 2d -
d /run/sapp/crashreport 0755 - - 30d -
L /opt/tsg/sapp/log - - - - /var/log/sapp
L /opt/tsg/sapp/alerts_files - - - - /run/sapp/alerts_files

2
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01
View File

@@ -9,7 +9,7 @@ cm:
db_dynamic: 1
coredump:
enable: 1/0
format: minidump/core/none
collect: local/sentry
sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595

2
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01
View File

@@ -9,7 +9,7 @@ cm:
db_dynamic: 1
coredump:
enable: 1/0
format: minidump/core/none
collect: local/sentry
sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595