Removing the obsolete logger network interface

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2478 980ebf18-57e1-0310-9a29-db15c13687c0

3 files changed, 0 insertions, 241 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$
diff --git a/test/network/handler/logger.rb b/test/network/handler/logger.rb
deleted file mode 100755
index 81c3926b5..000000000
--- a/test/network/handler/logger.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
-
-require 'puppettest'
-require 'puppet/network/handler/logger'
-require 'base64'
-require 'cgi'
-
-class TestLogger < Test::Unit::TestCase
-    include PuppetTest::ServerTest
-
-    def setup
-        super
-        
-        # Send the logs to an array, yo.
-        Puppet::Util::Log.close
-        @logs = []
-        Puppet::Util::Log.newdestination @logs
-    end
-
-    # Test the log driver manually
-    def test_localaddlog
-        logger = nil
-        assert_nothing_raised {
-            logger = Puppet::Network::Handler.logger.new
-        }
-
-        msg = nil
-        assert_nothing_raised {
-            msg = Puppet::Util::Log.create(
-                :level => :warning,
-                :message => "This is a message"
-            )
-        }
-
-        assert_nothing_raised {
-            logger.addlog(msg)
-        }
-    end
-
-    # Test it while replicating a remote client
-    def test_remoteaddlog
-        logger = nil
-        assert_nothing_raised {
-            logger = Puppet::Network::Handler.logger.new
-        }
-
-        msg = nil
-        assert_nothing_raised {
-            msg = Puppet::Util::Log.create(
-                :level => :warning,
-                :message => "This is a remote message"
-            )
-        }
-
-        assert_nothing_raised {
-            msg = CGI.escape(YAML.dump(msg))
-        }
-        assert_nothing_raised {
-            logger.addlog(msg, "localhost", "127.0.0.1")
-        }
-    end
-
-    # Now test it with a real client and server, but not remote
-    def test_localclient
-        client = nil
-        assert_nothing_raised {
-            client = Puppet::Network::Client.logger.new(:Logger => true)
-        }
-
-        msg = nil
-        assert_nothing_raised {
-            msg = Puppet::Util::Log.create(
-                :level => :warning,
-                :message => "This is a logclient message"
-            )
-        }
-
-        msg = CGI.escape(YAML.dump(msg))
-
-        assert_nothing_raised {
-            client.addlog(msg, "localhost", "127.0.0.1")
-        }
-    end
-
-    # And now test over the network
-    # This test is disabled, since it doesn't work well and it's not the right
-    # solution anyway.
-    def disabled_test_logclient
-        pid = nil
-        clientlog = tempfile()
-        serverlog = tempfile()
-        Puppet.warning "serverlog is %s" % serverlog
-        Puppet::Util::Log.newdestination clientlog
-        Puppet::Util::Log.close(:syslog)
-
-        # For testing
-        Puppet[:autosign] = true
-
-        logger = nil
-        # Create our server
-        assert_nothing_raised {
-            logger = Puppet::Network::Server.new(
-                :Port => @@port,
-                :Handlers => {
-                    :CA => {}, # so that certs autogenerate
-                    :Logger => {}
-                }
-            )
-        }
-
-        # Start our server
-        serverpid = fork {
-            Puppet::Util::Log.close(clientlog)
-            Puppet::Util::Log.newdestination serverlog
-            assert_nothing_raised() {
-                trap(:INT) { logger.shutdown }
-                logger.start
-            }
-        }
-        @@tmppids << serverpid
-        sleep(0.5)
-
-        # Start a raw xmlrpc client
-        client = nil
-        assert_nothing_raised() {
-            client = Puppet::Network::Client.logger.new(
-                :Server => "localhost",
-                :Port => @@port
-            )
-            unless client.readcert
-                raise "Could not get certs"
-            end
-        }
-        retval = nil
-
-        {
-            :notice => "XMLRPC1",
-            :warning => "XMLRPC2",
-            :err => "XMLRPC3"
-        }.each { |level, str|
-            msg = CGI.escape(YAML.dump(Puppet::Util::Log.create(
-                :level => level,
-                :message => str
-            )))
-            assert_nothing_raised {
-                retval = client.addlog(msg)
-            }
-        }
-
-        # and now use the normal client action
-
-        # Set the log destination to be the server
-        Puppet::Util::Log.newdestination "localhost:%s" % @@port
-
-        # And now do some logging
-        assert_nothing_raised {
-            Puppet.notice "TEST1"
-            Puppet.warning "TEST2"
-            Puppet.err "TEST3"
-        }
-
-        assert_nothing_raised {
-            Process.kill("INT", serverpid)
-        }
-
-        assert(FileTest.exists?(serverlog), "Server log does not exist")
-
-        # Give it a bit to flush to disk
-        sleep(0.5)
-        content = nil
-        assert_nothing_raised {
-            content = File.read(serverlog)
-        }
-
-        %w{TEST1 TEST2 TEST3}.each { |str|
-            assert(content =~ %r{#{str}}, "Content does not match %s" % str)
-        }
-    end
-end
-
-# $Id$