mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2025-01-03 14:56:34 -05:00
place the config reread flag in the global structure
svn path=/trunk/icecast/; revision=5175
This commit is contained in:
parent
9482db6016
commit
0c6493aa6d
@ -344,13 +344,13 @@ void connection_accept_loop(void)
|
|||||||
|
|
||||||
while (global.running == ICE_RUNNING)
|
while (global.running == ICE_RUNNING)
|
||||||
{
|
{
|
||||||
if (schedule_config_reread)
|
if (global . schedule_config_reread)
|
||||||
{
|
{
|
||||||
/* reread config file */
|
/* reread config file */
|
||||||
INFO0("Scheduling config reread ...");
|
INFO0("Scheduling config reread ...");
|
||||||
|
|
||||||
connection_inject_event(EVENT_CONFIG_READ, NULL);
|
connection_inject_event(EVENT_CONFIG_READ, NULL);
|
||||||
schedule_config_reread = 0;
|
global . schedule_config_reread = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
con = _accept_connection();
|
con = _accept_connection();
|
||||||
|
@ -21,6 +21,7 @@ typedef struct ice_global_tag
|
|||||||
|
|
||||||
int sources;
|
int sources;
|
||||||
int clients;
|
int clients;
|
||||||
|
int schedule_config_reread;
|
||||||
|
|
||||||
avl_tree *source_tree;
|
avl_tree *source_tree;
|
||||||
|
|
||||||
|
@ -15,8 +15,6 @@
|
|||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
#include "event.h"
|
#include "event.h"
|
||||||
|
|
||||||
#include "sighandler.h"
|
|
||||||
|
|
||||||
#define CATMODULE "sighandler"
|
#define CATMODULE "sighandler"
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
@ -24,8 +22,6 @@ void _sig_hup(int signo);
|
|||||||
void _sig_die(int signo);
|
void _sig_die(int signo);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int schedule_config_reread = 0;
|
|
||||||
|
|
||||||
void sighandler_initialize(void)
|
void sighandler_initialize(void)
|
||||||
{
|
{
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
@ -40,7 +36,7 @@ void sighandler_initialize(void)
|
|||||||
|
|
||||||
void _sig_hup(int signo)
|
void _sig_hup(int signo)
|
||||||
{
|
{
|
||||||
schedule_config_reread = 1;
|
global . schedule_config_reread = 1;
|
||||||
/* some OSes require us to reattach the signal handler */
|
/* some OSes require us to reattach the signal handler */
|
||||||
signal(SIGHUP, _sig_hup);
|
signal(SIGHUP, _sig_hup);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user