Add error handler for failing DNS requests; the Client should be able to take its...

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index c7e314db43ba675eaf9bf2abe21e60320afa9945..f1abcbef7ff9396550809c03be7b3af22edec87e 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -69,7 +69,7 @@
 
 static void IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher, int revents)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "EVENT Q: %s\n", __FUNCTION__);
 
        AsyncIO *IO = watcher->data;
        assert(IO->ShutdownAbort);
@@ -81,13 +81,13 @@ static void IO_abort_shutdown_callback(struct ev_loop *loop, ev_cleanup *watcher
  * Server DB IO 
  */
 extern int evdb_count;
-extern citthread_mutex_t DBEventQueueMutex;
+extern pthread_mutex_t DBEventQueueMutex;
 extern HashList *DBInboundEventQueue;
 extern struct ev_loop *event_db;
 extern ev_async DBAddJob;   
 extern ev_async DBExitEventLoop;
 
-int QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
 {
        IOAddHandler *h;
        int i;
@@ -100,15 +100,15 @@ int QueueDBOperation(AsyncIO *IO, IO_CallBack CB)
        IO->db_abort_by_shutdown.data = IO;
        ev_cleanup_start(event_db, &IO->db_abort_by_shutdown);
 
-       citthread_mutex_lock(&DBEventQueueMutex);
-       CtdlLogPrintf(CTDL_DEBUG, "DBEVENT Q\n");
+       pthread_mutex_lock(&DBEventQueueMutex);
+       syslog(LOG_DEBUG, "DBEVENT Q\n");
        i = ++evdb_count ;
        Put(DBInboundEventQueue, IKEY(i), h, NULL);
-       citthread_mutex_unlock(&DBEventQueueMutex);
+       pthread_mutex_unlock(&DBEventQueueMutex);
 
        ev_async_send (event_db, &DBAddJob);
-       CtdlLogPrintf(CTDL_DEBUG, "DBEVENT Q Done.\n");
-       return 0;
+       syslog(LOG_DEBUG, "DBEVENT Q Done.\n");
+       return eDBQuery;
 }
 
 void ShutDownDBCLient(AsyncIO *IO)
@@ -116,7 +116,7 @@ void ShutDownDBCLient(AsyncIO *IO)
        CitContext *Ctx =IO->CitContext;
        become_session(Ctx);
 
-       CtdlLogPrintf(CTDL_DEBUG, "DBEVENT\n");
+       syslog(LOG_DEBUG, "DBEVENT\n");
        ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
 
        assert(IO->Terminate);
@@ -130,7 +130,7 @@ void
 DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
-       CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
        become_session(IO->CitContext);
        
        ev_idle_stop(event_db, &IO->db_unwind_stack);
@@ -170,14 +170,14 @@ eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB)
  * Client IO 
  */
 extern int evbase_count;
-extern citthread_mutex_t EventQueueMutex;
+extern pthread_mutex_t EventQueueMutex;
 extern HashList *InboundEventQueue;
 extern struct ev_loop *event_base;
 extern ev_async AddJob;   
 extern ev_async ExitEventLoop;
 
 
-int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
+eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB)
 {
        IOAddHandler *h;
        int i;
@@ -190,26 +190,26 @@ int QueueEventContext(AsyncIO *IO, IO_CallBack CB)
        IO->abort_by_shutdown.data = IO;
        ev_cleanup_start(event_base, &IO->abort_by_shutdown);
 
-       citthread_mutex_lock(&EventQueueMutex);
-       CtdlLogPrintf(CTDL_DEBUG, "EVENT Q\n");
+       pthread_mutex_lock(&EventQueueMutex);
+       syslog(LOG_DEBUG, "EVENT Q\n");
        i = ++evbase_count;
        Put(InboundEventQueue, IKEY(i), h, NULL);
-       citthread_mutex_unlock(&EventQueueMutex);
+       pthread_mutex_unlock(&EventQueueMutex);
 
        ev_async_send (event_base, &AddJob);
-       CtdlLogPrintf(CTDL_DEBUG, "EVENT Q Done.\n");
-       return 0;
+       syslog(LOG_DEBUG, "EVENT Q Done.\n");
+       return eSendReply;
 }
 
 int ShutDownEventQueue(void)
 {
-       citthread_mutex_lock(&DBEventQueueMutex);
+       pthread_mutex_lock(&DBEventQueueMutex);
        ev_async_send (event_db, &DBExitEventLoop);
-       citthread_mutex_unlock(&DBEventQueueMutex);
+       pthread_mutex_unlock(&DBEventQueueMutex);
 
-       citthread_mutex_lock(&EventQueueMutex);
+       pthread_mutex_lock(&EventQueueMutex);
        ev_async_send (EV_DEFAULT_ &ExitEventLoop);
-       citthread_mutex_unlock(&EventQueueMutex);
+       pthread_mutex_unlock(&EventQueueMutex);
        return 0;
 }
 
@@ -240,7 +240,7 @@ void ShutDownCLient(AsyncIO *IO)
        CitContext *Ctx =IO->CitContext;
        become_session(Ctx);
 
-       CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
+       syslog(LOG_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
 
        ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
        StopClientWatchers(IO);
@@ -281,7 +281,6 @@ eReadState HandleInbound(AsyncIO *IO)
                                
                        switch (Finished) {
                        case eMustReadMore: /// read new from socket... 
-                               return Finished;
                                break;
                        case eBufferNotEmpty: /* shouldn't happen... */
                        case eReadSuccess: /// done for now...
@@ -579,9 +578,9 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
                return;
        } else if (nbytes == -1) {
 /// TODO: FD is gone. kick it.        sock_buff_invoke_free(sb, errno);
-               CtdlLogPrintf(CTDL_DEBUG,
-                             "EVENT: Socket Invalid! %s \n",
-                             strerror(errno));
+               syslog(LOG_DEBUG, 
+                      "EVENT: Socket Invalid! %s \n",
+                      strerror(errno));
                return;
        }
 }
@@ -590,13 +589,13 @@ void
 IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 {
        AsyncIO *IO = watcher->data;
-       CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
+       syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
        become_session(IO->CitContext);
-
+       assert(IO->DNSFail);
        switch (IO->DNSQuery->PostDNS(IO))
        {
        case eAbort:
-           ShutDownCLient(IO);
+               IO->DNSFail(IO);
        default:
            break;
        }
@@ -614,23 +613,23 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                        IPPROTO_TCP);
 
        if (IO->SendBuf.fd < 0) {
-               CtdlLogPrintf(CTDL_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
+               syslog(LOG_ERR, "EVENT: socket() failed: %s\n", strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to create socket: %s", strerror(errno));
                return eAbort;
        }
        fdflags = fcntl(IO->SendBuf.fd, F_GETFL);
        if (fdflags < 0) {
-               CtdlLogPrintf(CTDL_DEBUG,
-                             "EVENT: unable to get socket flags! %s \n",
-                             strerror(errno));
+               syslog(LOG_DEBUG, 
+                      "EVENT: unable to get socket flags! %s \n",
+                      strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to get socket flags: %s", strerror(errno));
                return eAbort;
        }
        fdflags = fdflags | O_NONBLOCK;
        if (fcntl(IO->SendBuf.fd, F_SETFL, fdflags) < 0) {
-               CtdlLogPrintf(CTDL_DEBUG,
-                             "EVENT: unable to set socket nonblocking flags! %s \n",
-                             strerror(errno));
+               syslog(LOG_DEBUG, 
+                      "EVENT: unable to set socket nonblocking flags! %s \n",
+                      strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to set socket flags: %s", strerror(errno));
                close(IO->SendBuf.fd);
                IO->SendBuf.fd = IO->RecvBuf.fd = -1;
@@ -658,13 +657,13 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
 
        if (rc >= 0){
-               CtdlLogPrintf(CTDL_DEBUG, "connect() immediate success.\n");
+               syslog(LOG_DEBUG, "connect() immediate success.\n");
                set_start_callback(event_base, IO, 0);
                ev_timer_start(event_base, &IO->rw_timeout);
                return IO->NextState;
        }
        else if (errno == EINPROGRESS) {
-               CtdlLogPrintf(CTDL_DEBUG, "connect() have to wait now.\n");
+               syslog(LOG_DEBUG, "connect() have to wait now.\n");
 
                ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
                IO->conn_event.data = IO;
@@ -679,7 +678,7 @@ eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_r
                IO->conn_fail_immediate.data = IO;
                ev_idle_start(event_base, &IO->conn_fail_immediate);
                
-               CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+               syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
                StrBufPrintf(IO->ErrMsg, "Failed to connect: %s", strerror(errno));
                return IO->NextState;
        }