Lynn Rees avatar Lynn Rees committed c621b2d Merge

- cleanup

Comments (0)

Files changed (2)

 *.pyc
 *.egg-info
 *~
+<<<<<<< local
 .DS_Store
+=======
+>>>>>>> other
 .figleaf
 .coverage
 build/
 dist/
+<<<<<<< local
+=======
+
+syntax: glob
+>>>>>>> other
 .project
+<<<<<<< local
 .pydevproject
 .git/
 .settings/
 ^graphalchemy/tests/foo3$
 syntax: regexp
 ^profile$
+=======
+>>>>>>> other
 syntax: glob
+<<<<<<< local
 tox/*
 syntax: glob
-.tox/*
+.tox/*=======
+.pydevproject>>>>>>> other
+# Copyright (c) 2011 L. C. Rees.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1.  Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3.  Neither the name of the Portable Site Information Project nor the names
+# of its contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+'''setup for wsgilog.'''
+
+try:
+    from setuptools import setup
+except:
+    from distutils.core import setup
+
+setup(name='wsgilog',
+      version='0.3',
+      description='''WSGI logging and event reporting middleware.''',
+      long_description='''Supports logging events in WSGI applications to
+STDOUT, time rotated log files, email, syslog, and web servers. Also
+supports catching and sending HTML-formatted exception tracebacks to a
+web browser for debugging.
+
+# Simple usage example:
+
+from wsgilog import log
+
+@log(tohtml=True, tofile='wsgi.log', tostream=True, toprint=True)
+def app(environ, start_response):
+    print 'STDOUT is logged.'
+    environ['wsgilog.logger'].info('This information is logged.')
+    # Exception will be logged and sent to the browser formatted as HTML.
+    raise Exception()
+
+if __name__ == '__main__':
+    from wsgiref.simple_server import make_server
+    http = make_server('', 8080, app)
+    http.serve_forever()
+''',
+      author='L. C. Rees',
+      author_email='lcrees@gmail.com',
+      license='BSD',
+      packages = ['wsgilog'],
+      zip_safe = True,
+      keywords='WSGI logging middleware web http',
+      classifiers=[
+          'Development Status :: 4 - Beta',
+          'Environment :: Web Environment',
+          'License :: OSI Approved :: BSD License',
+          'Natural Language :: English',
+          'Operating System :: OS Independent',
+          'Programming Language :: Python',
+          'Topic :: System :: Monitoring',
+          'Topic :: System :: Logging',
+          'Topic :: Internet :: WWW/HTTP :: Site Management',
+          'Topic :: Internet :: WWW/HTTP :: WSGI',
+          'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware'
+      ]
+)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.