aboutsummaryrefslogtreecommitdiff
path: root/src/common/torlog.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-12-21 15:48:14 -0500
committerNick Mathewson <nickm@torproject.org>2010-12-21 15:48:14 -0500
commitcdbd6d0fe88ed305bff33388439297474b27f352 (patch)
treee01b7c688e08d709d40b2dfcb59454812704cf62 /src/common/torlog.h
parent029ca804b2bed051185cc21477a713f670106cae (diff)
parentcc051f9aca96b55533953cfcc10c86f9fe1e7b9a (diff)
downloadtor-cdbd6d0fe88ed305bff33388439297474b27f352.tar.gz
tor-cdbd6d0fe88ed305bff33388439297474b27f352.zip
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
Diffstat (limited to 'src/common/torlog.h')
-rw-r--r--src/common/torlog.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 21219569e3..73c690631f 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -95,6 +95,10 @@
/** Number of logging domains in the code. */
#define N_LOGGING_DOMAINS 20
+/** This log message is not safe to send to a callback-based logger
+ * immediately. Used as a flag, not a log domain. */
+#define LD_NOCB (1u<<31)
+
typedef uint32_t log_domain_mask_t;
/** Configures which severities are logged for each logging domain for a given
@@ -137,6 +141,7 @@ void rollback_log_changes(void);
void mark_logs_temp(void);
void change_callback_log_severity(int loglevelMin, int loglevelMax,
log_callback cb);
+void flush_pending_log_callbacks(void);
void log_set_application_name(const char *name);
/* Outputs a message to stdout */