From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 25 Oct 2022 14:24:55 +0000 (-0400)
Subject: log: reorg header
X-Git-Tag: v17.2.7~446^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=036278d0bec64c701a5085981c3c74f5cb3500e2;p=ceph.git

log: reorg header

To follow code style guidelines.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4a277dfdb020651506ffd47cc8337bcfe90d191e)

Conflicts:
	src/log/Log.h: reorg conflicts
---

diff --git a/src/log/Log.h b/src/log/Log.h
index 0d83ff037f75..4c9735795d21 100644
--- a/src/log/Log.h
+++ b/src/log/Log.h
@@ -29,6 +29,54 @@ class SubsystemMap;
 
 class Log : private Thread
 {
+public:
+  using Thread::is_started;
+
+  Log(const SubsystemMap *s);
+  ~Log() override;
+
+  void set_flush_on_exit();
+
+  void set_coarse_timestamps(bool coarse);
+  void set_max_new(std::size_t n);
+  void set_max_recent(std::size_t n);
+  void set_log_file(std::string_view fn);
+  void reopen_log_file();
+  void chown_log_file(uid_t uid, gid_t gid);
+  void set_log_stderr_prefix(std::string_view p);
+
+  void flush();
+
+  void dump_recent();
+
+  void set_syslog_level(int log, int crash);
+  void set_stderr_level(int log, int crash);
+  void set_graylog_level(int log, int crash);
+
+  void start_graylog(const std::string& host,
+		     const uuid_d& fsid);
+  void stop_graylog();
+
+  void set_journald_level(int log, int crash);
+
+  void start_journald_logger();
+  void stop_journald_logger();
+
+  std::shared_ptr<Graylog> graylog() { return m_graylog; }
+
+  void submit_entry(Entry&& e);
+
+  void start();
+  void stop();
+
+  /// true if the log lock is held by our thread
+  bool is_inside_log_lock();
+
+  /// induce a segv on the next log event
+  void inject_segv();
+  void reset_segv();
+
+private:
   using EntryRing = boost::circular_buffer<ConcreteEntry>;
   using EntryVector = std::vector<ConcreteEntry>;
 
@@ -85,52 +133,7 @@ class Log : private Thread
 
   void _log_message(std::string_view s, bool crash);
 
-public:
-  using Thread::is_started;
-
-  Log(const SubsystemMap *s);
-  ~Log() override;
-
-  void set_flush_on_exit();
-
-  void set_coarse_timestamps(bool coarse);
-  void set_max_new(std::size_t n);
-  void set_max_recent(std::size_t n);
-  void set_log_file(std::string_view fn);
-  void reopen_log_file();
-  void chown_log_file(uid_t uid, gid_t gid);
-  void set_log_stderr_prefix(std::string_view p);
-
-  void flush();
-
-  void dump_recent();
-
-  void set_syslog_level(int log, int crash);
-  void set_stderr_level(int log, int crash);
-  void set_graylog_level(int log, int crash);
-
-  void start_graylog(const std::string& host,
-		     const uuid_d& fsid);
-  void stop_graylog();
-
-  void set_journald_level(int log, int crash);
-
-  void start_journald_logger();
-  void stop_journald_logger();
-
-  std::shared_ptr<Graylog> graylog() { return m_graylog; }
 
-  void submit_entry(Entry&& e);
-
-  void start();
-  void stop();
-
-  /// true if the log lock is held by our thread
-  bool is_inside_log_lock();
-
-  /// induce a segv on the next log event
-  void inject_segv();
-  void reset_segv();
 };
 
 }