Commit f9eb8f7e authored by Martin Mareš's avatar Martin Mareš

If compiled with --enable-debug, don't even try to log to syslog unless

the user forces it in the config file.
parent 972fdb45
...@@ -4,6 +4,7 @@ Core ...@@ -4,6 +4,7 @@ Core
- &&,||: priorities - &&,||: priorities
- client: `?' in BGP masks - client: `?' in BGP masks
- filters: function for BGP path length - filters: function for BGP path length
- static: allow specifying a per-route filter program for setting route attributes?
Globals Globals
~~~~~~~ ~~~~~~~
...@@ -21,7 +22,6 @@ Globals ...@@ -21,7 +22,6 @@ Globals
Various ideas Various ideas
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
- static: allow specifying a per-route filter program for setting route attributes?
- client: paging of output - client: paging of output
- client: Ctrl-R eats one more enter - client: Ctrl-R eats one more enter
- bgp: timing of updates? - bgp: timing of updates?
......
...@@ -207,10 +207,10 @@ log_init(int debug, int init) ...@@ -207,10 +207,10 @@ log_init(int debug, int init)
} }
void void
log_switch(list *l) log_switch(int debug, list *l)
{ {
if (EMPTY_LIST(*l)) if (EMPTY_LIST(*l))
log_init(0, 0); log_init(debug, 0);
else else
current_log_list = l; current_log_list = l;
} }
......
...@@ -35,6 +35,12 @@ ...@@ -35,6 +35,12 @@
* Debugging * Debugging
*/ */
#ifdef DEBUGGING
static int debug_flag = 1;
#else
static int debug_flag = 0;
#endif
void void
async_dump(void) async_dump(void)
{ {
...@@ -77,7 +83,7 @@ sysdep_preconfig(struct config *c) ...@@ -77,7 +83,7 @@ sysdep_preconfig(struct config *c)
int int
sysdep_commit(struct config *new, struct config *old) sysdep_commit(struct config *new, struct config *old)
{ {
log_switch(&new->logfiles); log_switch(debug_flag, &new->logfiles);
return 0; return 0;
} }
...@@ -342,12 +348,6 @@ signal_init(void) ...@@ -342,12 +348,6 @@ signal_init(void)
static char *opt_list = "c:dD:s:"; static char *opt_list = "c:dD:s:";
#ifdef DEBUGGING
static int debug_flag = 1;
#else
static int debug_flag = 0;
#endif
static void static void
usage(void) usage(void)
{ {
......
...@@ -55,7 +55,7 @@ void krt_io_init(void); ...@@ -55,7 +55,7 @@ void krt_io_init(void);
void log_init(int debug, int init); void log_init(int debug, int init);
void log_init_debug(char *); /* Initialize debug dump to given file (NULL=stderr, ""=off) */ void log_init_debug(char *); /* Initialize debug dump to given file (NULL=stderr, ""=off) */
void log_switch(struct list *); void log_switch(int debug, struct list *);
struct log_config { struct log_config {
node n; node n;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment