log: allow stop() when not started

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f3862d8849c014a4a863ebedc9719241ec9c2c46)

diff --git a/src/log/Log.cc b/src/log/Log.cc
index 6af49b4c8cd56fd2a37ecb7f00b37fe215681193..5f7e23b4b048c0343972e53355463a864ea2a108 100644 (file)
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -433,13 +433,14 @@ void Log::start()
 
 void Log::stop()
 {
-  assert(is_started());
-  pthread_mutex_lock(&m_queue_mutex);
-  m_stop = true;
-  pthread_cond_signal(&m_cond_flusher);
-  pthread_cond_broadcast(&m_cond_loggers);
-  pthread_mutex_unlock(&m_queue_mutex);
-  join();
+  if (is_started()) {
+    pthread_mutex_lock(&m_queue_mutex);
+    m_stop = true;
+    pthread_cond_signal(&m_cond_flusher);
+    pthread_cond_broadcast(&m_cond_loggers);
+    pthread_mutex_unlock(&m_queue_mutex);
+    join();
+  }
 }
 
 void *Log::entry()