improve logging output of event clients & opnional DNS lookup

[citadel.git] / citadel / event_client.h

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 9564e5ba17b6eeeb9bce4222353e919e1a49f9e1..6d4f50dedcb47167d48e6491ce83035cd3b8ab91 100644 (file)
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -120,6 +120,9 @@ struct AsyncIO {
        /* DNS Related */
        ev_io dns_recv_event, 
                dns_send_event;
+#ifdef DEBUG_CARES
+       short int DnsSourcePort;
+#endif
        struct ares_options DNSOptions;
        ares_channel DNSChannel;
        DNSQueryParts *DNSQuery;
@@ -140,8 +143,12 @@ typedef struct _IOAddHandler {
        IO_CallBack EvAttch;
 }IOAddHandler; 
 
-#define EV_syslog(LEVEL, FORMAT, ...) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID, __VA_ARGS__)
-#define EVM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
+#define CCID ((CitContext*)IO->CitContext)->cs_pid
+#define EV_syslog(LEVEL, FORMAT, ...) syslog(LEVEL, "IO[%ld]CC[%d]" FORMAT, IO->ID, CCID, __VA_ARGS__)
+#define EVM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]CC[%d]" FORMAT, IO->ID, CCID)
+
+#define EVNC_syslog(LEVEL, FORMAT, ...) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID, __VA_ARGS__)
+#define EVNCM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
 
 void FreeAsyncIOContents(AsyncIO *IO);
 
@@ -180,12 +187,12 @@ void InitC_ares_dns(AsyncIO *IO);
                        syslog(LOG_ERR, "error setting option " #s " on curl handle: %s", curl_easy_strerror(sta)); \
        } } while (0)
 
-
-int evcurl_init(AsyncIO *IO, 
-               void *CustomData, 
-               const char* Desc,
-               IO_CallBack CallBack, 
-               IO_CallBack Terminate);
+int evcurl_init(AsyncIO *IO,
+                void *CustomData,
+                const char* Desc,
+                IO_CallBack CallBack,
+                IO_CallBack Terminate, 
+               IO_CallBack ShutdownAbort);
 
 eNextState ReAttachIO(AsyncIO *IO, 
                      void *pData,