X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fworker.c;h=ce4a53b26051505d5e995b335c7cbee87e72adef;hb=e018053f14beb09ac7f634687c48ac2a214208f2;hp=b6d268deb62e71a5316d53318869d03c3b678fae;hpb=c1988c0032397c082e4e3b44dc45c59cc7603d0f;p=sliver-openvswitch.git

diff --git a/lib/worker.c b/lib/worker.c
index b6d268deb..ce4a53b26 100644
--- a/lib/worker.c
+++ b/lib/worker.c
@@ -37,6 +37,11 @@
 
 VLOG_DEFINE_THIS_MODULE(worker);
 
+/* ovs_assert() logs the assertion message and logging sometimes goes through a
+ * worker, so using ovs_assert() in this source file could cause recursion. */
+#undef ovs_assert
+#define ovs_assert use_assert_instead_of_ovs_assert_in_this_module
+
 /* Header for an RPC request. */
 struct worker_request {
     size_t request_len;              /* Length of the payload in bytes. */
@@ -340,7 +345,7 @@ worker_reply_iovec(const struct iovec *iovs, size_t n_iovs,
          * to avoid missing log messages. */
         VLOG_INFO("send failed (%s)", strerror(error));
     } else if (error) {
-        VLOG_ABORT("send failed (%s)", strerror(error));
+        VLOG_FATAL("send failed (%s)", strerror(error));
     }
 
     free(all_iovs);
@@ -374,7 +379,7 @@ worker_main(int fd)
             /* Main process closed the IPC socket.  Exit cleanly. */
             break;
         } else if (error != EAGAIN) {
-            VLOG_ABORT("RPC receive failed (%s)", strerror(error));
+            VLOG_FATAL("RPC receive failed (%s)", ovs_retval_to_string(error));
         }
 
         poll_fd_wait(server_sock, POLLIN);