summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-07 22:25:33 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-07 22:25:33 +0000
commit69cb72120ced589b81038f685f9765ceb353e062 (patch)
tree61cd190128e132112408ee8dc7da42cf8ebe6d8e /lib/puppet
parenta040bd48b1e36e9e6e363896fe98e093b3b19bd0 (diff)
downloadpuppet-69cb72120ced589b81038f685f9765ceb353e062.tar.gz
puppet-69cb72120ced589b81038f685f9765ceb353e062.tar.xz
puppet-69cb72120ced589b81038f685f9765ceb353e062.zip
Removing the obsolete logger network interface
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2478 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/client/logger.rb6
-rwxr-xr-xlib/puppet/network/handler/logger.rb52
2 files changed, 0 insertions, 58 deletions
diff --git a/lib/puppet/network/client/logger.rb b/lib/puppet/network/client/logger.rb
deleted file mode 100644
index 9c18efcd9..000000000
--- a/lib/puppet/network/client/logger.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Puppet::Network::Client::Logger < Puppet::Network::Client::ProxyClient
- @handler = Puppet::Network::Handler.handler(:logger)
- self.mkmethods
-end
-
-# $Id$
diff --git a/lib/puppet/network/handler/logger.rb b/lib/puppet/network/handler/logger.rb
deleted file mode 100755
index f01b48325..000000000
--- a/lib/puppet/network/handler/logger.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'yaml'
-
-class Puppet::Network::Handler
- class LoggerError < RuntimeError; end
-
- # Receive logs from remote hosts.
- class Logger < Handler
- @interface = XMLRPC::Service::Interface.new("puppetlogger") { |iface|
- iface.add_method("void addlog(string)")
- }
-
- # accept a log message from a client, and route it accordingly
- def addlog(message, client = nil, clientip = nil)
- unless message
- raise Puppet::DevError, "Did not receive message"
- end
-
- Puppet.info message.inspect
- # if the client is set, then we're not local
- if client
- begin
- message = YAML.load(CGI.unescape(message))
- #message = message
- rescue => detail
- raise XMLRPC::FaultException.new(
- 1, "Could not unYAML log message from %s" % client
- )
- end
- end
-
- unless message
- raise Puppet::DevError, "Could not resurrect message"
- end
-
- # Mark it as remote, so it's not sent to syslog
- message.remote = true
-
- if client
- if ! message.source or message.source == "Puppet"
- message.source = client
- end
- end
-
- Puppet::Util::Log.newmessage(message)
-
- # This is necessary or XMLRPC gets all pukey
- return ""
- end
- end
-end
-
-# $Id$