summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-04-23 18:05:38 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-05-06 15:09:44 -0700
commitef30733797e3990ed33b9ca537f8ce86cba37486 (patch)
treed4fca2a2494c9ab3e668e031826eec85f019c98d
parent8a5d5a7501bb6763e2dc65c8874aff5a1d5e9d50 (diff)
downloadchef-ef30733797e3990ed33b9ca537f8ce86cba37486.tar.gz
extract Chef::Log::Sylog class to its own file
-rw-r--r--lib/chef/log.rb27
-rw-r--r--lib/chef/log/syslog.rb51
2 files changed, 52 insertions, 26 deletions
diff --git a/lib/chef/log.rb b/lib/chef/log.rb
index 2dd2896fd9..84d71c4f9c 100644
--- a/lib/chef/log.rb
+++ b/lib/chef/log.rb
@@ -21,35 +21,10 @@ require 'logger'
require 'chef/monologger'
require 'chef/exceptions'
require 'mixlib/log'
-require 'syslog-logger'
+require 'chef/log/syslog'
class Chef
class Log
- #
- # Chef::Log::Syslog class.
- # usage in client.rb:
- # log_location Chef::Log::Syslog.new("chef-client", ::Syslog::LOG_DAEMON)
- #
- class Syslog < Logger::Syslog
- attr_accessor :sync, :formatter
-
- def initialize(program_name = 'chef-client', facility = ::Syslog::LOG_DAEMON, logopts=nil)
- super
- return if defined? ::Logger::Syslog::SYSLOG
- ::Logger::Syslog.const_set :SYSLOG, SYSLOG
- end
-
- def write(message)
- data = message.match(/(\[.+?\]) ([\w]+):(.*)$/)
- self.send(data[2].downcase.to_sym, data[3].strip)
- rescue NoMethodError
- self.send(:info, message)
- end
-
- def close
- end
- end
-
extend Mixlib::Log
# Force initialization of the primary log device (@logger)
diff --git a/lib/chef/log/syslog.rb b/lib/chef/log/syslog.rb
new file mode 100644
index 0000000000..954d8f95e6
--- /dev/null
+++ b/lib/chef/log/syslog.rb
@@ -0,0 +1,51 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: AJ Christensen (<@aj@opscode.com>)
+# Author:: Christopher Brown (<cb@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'logger'
+require 'syslog-logger'
+
+class Chef
+ class Log
+ #
+ # Chef::Log::Syslog class.
+ # usage in client.rb:
+ # log_location Chef::Log::Syslog.new("chef-client", ::Syslog::LOG_DAEMON)
+ #
+ class Syslog < Logger::Syslog
+ attr_accessor :sync, :formatter
+
+ def initialize(program_name = 'chef-client', facility = ::Syslog::LOG_DAEMON, logopts=nil)
+ super
+ return if defined? ::Logger::Syslog::SYSLOG
+ ::Logger::Syslog.const_set :SYSLOG, SYSLOG
+ end
+
+ def write(message)
+ data = message.match(/(\[.+?\]) ([\w]+):(.*)$/)
+ self.send(data[2].downcase.to_sym, data[3].strip)
+ rescue NoMethodError
+ self.send(:info, message)
+ end
+
+ def close
+ end
+ end
+ end
+end
+