From: Marcel Lauhoff <ml@irq0.org>
Date: Tue, 24 Feb 2015 23:29:30 +0000 (+0100)
Subject: debian: Add build dep 'libboost-iostreams-dev'
X-Git-Tag: v10.0.4~72^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f88fcf032f31fd82f6c1ec56ac63b3a6451c5262;p=ceph.git

debian: Add build dep 'libboost-iostreams-dev'

Required by graylog logging backend

Signed-off-by: Marcel Lauhoff <ml@irq0.org>
---

diff --git a/debian/control b/debian/control
index de628453a10d..94c5b427d223 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends: autoconf,
                libboost-thread-dev (>= 1.42),
 	       libboost-regex-dev,
 	       libboost-random-dev,
+               libboost-iostreams-dev (>= 1.42),
                libcurl4-gnutls-dev,
                libexpat1-dev,
                libfcgi-dev,
diff --git a/src/log/Graylog.h b/src/log/Graylog.h
index 6c5bb1d2c0e8..6f78032d7a93 100644
--- a/src/log/Graylog.h
+++ b/src/log/Graylog.h
@@ -32,6 +32,8 @@ class Graylog
 
   void log_entry(Entry const * const e);
 
+  typedef ceph::shared_ptr<Graylog> Ref;
+
  private:
   SubsystemMap const * const m_subs;
 
diff --git a/src/log/Log.cc b/src/log/Log.cc
index feda7f135187..555f7684f81e 100644
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -171,7 +171,7 @@ void Log::start_graylog()
 {
   pthread_mutex_lock(&m_flush_mutex);
   if (! m_graylog.get())
-    m_graylog = boost::shared_ptr<Graylog>(new Graylog(m_subs));
+    m_graylog = Graylog::Ref(new Graylog(m_subs));
   pthread_mutex_unlock(&m_flush_mutex);
 }
 
diff --git a/src/log/Log.h b/src/log/Log.h
index 965cbc273d10..03cd1d0f633b 100644
--- a/src/log/Log.h
+++ b/src/log/Log.h
@@ -42,7 +42,7 @@ class Log : private Thread
   int m_stderr_log, m_stderr_crash;
   int m_graylog_log, m_graylog_crash;
 
-  boost::shared_ptr<Graylog> m_graylog;
+  Graylog::Ref m_graylog;
 
   bool m_stop;
 
@@ -77,7 +77,6 @@ public:
 
   void start_graylog();
   void stop_graylog();
-  void update_graylog(const std::string& host, int port);
 
   Graylog::Ref graylog() { return m_graylog; }