annotate files/patch-core-logging.c @ 118:20416e8b70cc origin

Update to 2.0.19.1
author Franz Glasner <fzglas.hg@dom66.de>
date Sun, 16 May 2021 15:55:19 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
118
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1 --- core/logging.c.orig 2020-11-06 10:12:49.865752000 +0100
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
2 +++ core/logging.c 2020-11-06 10:17:57.825745000 +0100
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
3 @@ -536,13 +536,23 @@
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
4 uwsgi_error_open(logfile);
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
5 exit(1);
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
6 }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
7 - else {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
8 - if (dup2(fd, log_fd) < 0) {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
9 - // this could be lost :(
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
10 - uwsgi_error("uwsgi_log_do_rotate()/dup2()");
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
11 - exit(1);
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
12 - }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
13 + if (dup2(fd, log_fd) < 0) {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
14 + // this could be lost :(
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
15 + uwsgi_error("uwsgi_log_do_rotate()/dup2()");
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
16 close(fd);
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
17 + exit(1);
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
18 + }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
19 + close(fd);
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
20 +
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
21 + if (uwsgi.chmod_logfile_value) {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
22 + if (fchmod(log_fd, uwsgi.chmod_logfile_value)) {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
23 + uwsgi_error("fchmod()");
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
24 + }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
25 + }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
26 + if (uwsgi.logfile_chown) {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
27 + if (fchown(log_fd, uwsgi.uid, uwsgi.gid)) {
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
28 + uwsgi_error("fchown()");
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
29 + }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
30 }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
31 }
20416e8b70cc Update to 2.0.19.1
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
32 else {