clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-06 05:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #636 from prymitive/issue635

Browse Source 
fixed log setup when both --logto and --log2, fixes unbit/uwsgi#635
This commit is contained in:
unbit
2014-05-24 09:59:21 +02:00
parent db509f2d38 0a9345b8d4
commit dc250fd7b5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/uwsgi.c
+5 -2
View File
@@ -2225,7 +2225,7 @@ void uwsgi_setup(int argc, char *argv[], char *envp[]) {
uwsgi_opt_flock(NULL, uwsgi.flock_wait2, NULL);
// setup master logging
if (uwsgi.log_master && !uwsgi.daemonize2 && !uwsgi.logto2)
if (uwsgi.log_master && !uwsgi.daemonize2 && uwsgi.logfile)
uwsgi_setup_log_master();
// setup offload engines
@@ -2507,8 +2507,11 @@ int uwsgi_start(void *v_argv) {
if (uwsgi.logto2) {
if (!uwsgi.is_a_reload || uwsgi.log_reopen) {
int setup_log = 0;
if (!uwsgi.logfile) setup_log = 1; // logto() will replace uwsgi.logfile and we need to check it later
logto(uwsgi.logto2);
uwsgi_setup_log_master();
if (setup_log)
uwsgi_setup_log_master();
}
}