branching for 0.3.0

Lawouach · Lawouach · commit 2d21b8632a76 · 2013-02-02T12:16:49.000+01:00
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 setup(name = "ws4py",
-      version = '0.2.5',
+      version = '0.3.0',
       description = "WebSocket library for Python",
       maintainer = "Sylvain Hellegouarch",
       maintainer_email = "sh@defuze.org",
diff --git a/ws4py/__init__.py b/ws4py/__init__.py
@@ -26,12 +26,32 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+import logging
 from ws4py.compat import enc
 
 __author__ = "Sylvain Hellegouarch"
-__version__ = "0.2.5"
-__all__ = ['WS_KEY', 'WS_VERSION']
+__version__ = "0.3.0"
+__all__ = ['WS_KEY', 'WS_VERSION', 'configure_logger']
 
 WS_KEY = enc("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
 WS_VERSION = (8, 13)
 
+def configure_logger(stdout=True, filepath=None, level=logging.INFO):
+    logger = logging.getLogger('ws4py')
+    logger.setLevel(level)
+    logfmt = logging.Formatter("[%(asctime)s] %(levelname)s %(message)s")
+
+    if filepath:
+        h = handlers.RotatingFileHandler(filepath, maxBytes=10485760, backupCount=3)
+        h.setLevel(level)
+        h.setFormatter(logfmt)
+        logger.addHandler(h)
+
+    if stdout:
+        import sys
+        h = logging.StreamHandler(sys.stdout)
+        h.setLevel(level)
+        h.setFormatter(logfmt)
+        logger.addHandler(h)
+
+    return logger
