Refs #12715 - decoupled logs API from core

theforeman · Jan 27, 2016 · 98b4df5 · 98b4df5
1 parent 91d4aa6
commit 98b4df5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 51 deletions.
diff --git a/config/settings.d/logs.yml.example b/config/settings.d/logs.yml.example
@@ -0,0 +1,5 @@
+---
+# Can be true, false, or http/https to enable just one of the protocols
+:enabled: false
+
+# Log buffer configuration is in core file (settings.yml)
diff --git a/lib/proxy/log_buffer/buffer.rb b/lib/proxy/log_buffer/buffer.rb
@@ -30,6 +30,8 @@ def to_h
   end
 
   class Buffer
+    attr_reader :size, :size_tail
+
     def self.instance
       @@buffer ||= Buffer.new
     end

diff --git a/lib/smart_proxy_main.rb b/lib/smart_proxy_main.rb
@@ -68,7 +68,8 @@ module Proxy
   require 'puppetca/puppetca'
   require 'puppet_proxy/puppet'
   require 'bmc/bmc'
-  require "realm/realm"
+  require 'realm/realm'
+  require 'logs/logs'
 
   def self.version
     {:version => VERSION}

diff --git a/modules/root/http_config.ru b/modules/root/http_config.ru
@@ -1,10 +1,5 @@
 require 'root/root_api'
-require 'root/logs_api'
 
 map "/" do
   run Proxy::RootApi
 end
-
-map "/logs" do
-  run Proxy::LogsApi
-end
diff --git a/modules/root/logs_api.rb b/modules/root/logs_api.rb
diff --git a/test/root/logs_api_test.rb b/test/root/logs_api_test.rb