jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sesman logging disruption after SIGHUP

Browse Source
This commit is contained in:
jsorg71 2010-07-26 03:46:36 +00:00
parent f6f005ca58
commit fb7e652d65
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sesman/sig.c
View File

@ -64,6 +64,7 @@ sig_sesman_shutdown(int sig)
void DEFAULT_CC void DEFAULT_CC
sig_sesman_reload_cfg(int sig) sig_sesman_reload_cfg(int sig)
{ {
int error;
struct config_sesman *cfg; struct config_sesman *cfg;
log_message(&(g_cfg->log), LOG_LEVEL_WARNING, "receiving SIGHUP %d", 1); log_message(&(g_cfg->log), LOG_LEVEL_WARNING, "receiving SIGHUP %d", 1);
@ -86,10 +87,30 @@ sig_sesman_reload_cfg(int sig)
log_message(&(g_cfg->log), LOG_LEVEL_ERROR, "error reading config - keeping old cfg"); log_message(&(g_cfg->log), LOG_LEVEL_ERROR, "error reading config - keeping old cfg");
return; return;
} }
#warning FIXME reload configuration must NOT damage logging!
/* stop logging subsystem */
log_end(&(g_cfg->log));
/* replace old config with new readed one */
g_cfg = cfg; g_cfg = cfg;
log_message(&(g_cfg->log), LOG_LEVEL_INFO, "configuration reloaded"); /* start again logging subsystem */
error = log_start(&(g_cfg->log));
if (error != LOG_STARTUP_OK)
{
switch (error)
{
case LOG_ERROR_MALLOC:
g_printf("error on malloc. cannot restart logging. log stops here, sorry.\n");
break;
case LOG_ERROR_FILE_OPEN:
g_printf("error reopening log file [%s]. log stops here, sorry.\n", g_cfg->log.log_file);
break;
}
}
log_message(&(g_cfg->log), LOG_LEVEL_INFO, "configuration reloaded, log subsystem restarted");
} }
/******************************************************************************/ /******************************************************************************/