From d7373be0718ad350115fa5e9f78dce0b806d054f Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Mon, 14 Jan 2019 20:14:08 +0300 Subject: [PATCH] Revert "Fixed: logrotation may stop after config change" This reverts commit ede4aee6190509b11636f83f55843cb28e93adb4. --- src/conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf.c b/src/conf.c index a260862..64ad1e0 100644 --- a/src/conf.c +++ b/src/conf.c @@ -285,6 +285,10 @@ static int h_log(int argc, unsigned char ** argv){ havelog = 1; + if(argc > 1 && conf.logtarget && *argv[1]!= '&' && *argv[1]!= '@' && !strcmp((char *)conf.logtarget, (char *)argv[1])) { + conf.logfunc = logstdout; + return 0; + } if(conf.logtarget){ myfree(conf.logtarget); conf.logtarget = NULL; @@ -319,7 +323,6 @@ static int h_log(int argc, unsigned char ** argv){ if(argc > 2) { conf.logtype = getrotate(*argv[2]); } - if(!strcmp((char *)conf.logtarget, (char *)argv[1])) return 0; conf.logtime = time(0); if(conf.logname)myfree(conf.logname); conf.logname = (unsigned char *)mystrdup((char *)argv[1]);