Merge branch 'syslog'

* syslog:
  Made frontik to log into syslog
  syslogging
  sysloggin

src/frontik.cfg.ex

@@ -1,10 +1,23 @@
-host = 'localhost'
-port = 8080
+host = '0.0.0.0'
+port = 8080 
+workers_count = 1
 
-document_dir = '/var/www/frontik/'
+daemonize = False
 
-log_level = 'debug'
+loglevel = 'debug'
+logfile = None # log to stderr
+
+syslog = True
+syslog_address = "/dev/log"
+
+pidfile = None
+
+apps = { 'page' : '/path/' }
+
+use_standart_doc = False
 
 debug = True
 debug_login = "hh"
 debug_password = "12345"
+
+

src/frontik/app.py

@@ -4,7 +4,7 @@
 
 import tornado.web
 import tornado.ioloop
-import logging
+import frontik.log as logging
 from tornado.options import options
 
 import frontik.magic_imp

src/frontik/async.py

@@ -3,7 +3,7 @@
 import time
 import Queue
 
-import logging
+import frontik.log as logging
 log = logging.getLogger('frontik.async')
 
 

src/frontik/handler.py

@@ -29,7 +29,7 @@
 import frontik.handler_whc_limit
 import frontik.handler_debug
 
-import logging
+import frontik.log as logging
 log = logging.getLogger('frontik.handler')
 
 import future
@@ -189,6 +189,7 @@ def __init__(self, ph_globals, application, request):
         else:
             self.apply_postprocessor = True
 
+
     def require_debug_access(self):
         if not tornado.options.options.debug:
             frontik.auth.require_basic_auth(self, tornado.options.options.debug_login,

src/frontik/handler_debug.py

@@ -1,4 +1,4 @@
-import logging
+import frontik.log as logging
 import tornado
 import weakref
 import xml.sax.saxutils

src/frontik/handler_xml.py

@@ -13,7 +13,7 @@
 import frontik.auth
 import frontik.xml_util
 
-import logging
+import frontik.log as logging
 lgo = logging.getLogger('frontik.server')
 log_xsl = logging.getLogger('frontik.handler.xsl')
 log_fileloader = logging.getLogger('frontik.server.fileloader')

src/frontik/log.py

@@ -0,0 +1,22 @@
+
+
+import tornado.options
+import logging
+import logging.handlers
+from logging import *
+
+Filterer = logging.Filterer
+
+if tornado.options.options.syslog:
+	_syslog_formatter = logging.Formatter('[%(asctime)s %(name)s] %(levelname)s %(message)s')
+	_handler = logging.handlers.SysLogHandler(facility=logging.handlers.SysLogHandler.LOG_DEBUG, address=tornado.options.options.syslog_address)
+	_handler.setFormatter(_syslog_formatter)
+
+def getLogger(*args, **kwargs):
+	log = logging.getLogger(*args, **kwargs)
+
+	if tornado.options.options.syslog:
+		tornado.options.options.syslog
+		log.addHandler(_handler)
+	return log
+

src/frontik/magic_imp.py

@@ -3,7 +3,7 @@
 import imp
 import functools
 
-import logging
+import frontik.log as logging
 log = logging.getLogger('frontik.imp')
 
 def gen_module_name(app_name, module_name=None):

src/frontik/util.py

@@ -176,3 +176,4 @@ def _asciify_url_char(c):
 
 def asciify_url(url):
     return ''.join(map(_asciify_url_char, url))
+

src/frontik/xml_util.py

@@ -1,4 +1,4 @@
-import logging
+import frontik.log as logging
 import os.path
 
 from frontik import etree

src/frontik_dev.cfg

@@ -0,0 +1,25 @@
+host = '0.0.0.0'
+port = 8080 
+workers_count = 1
+
+daemonize = False
+
+loglevel = 'debug'
+logfile = None # log to stderr
+
+syslog = True
+syslog_address = "/dev/log"
+syslog_only = True
+
+pidfile = None
+
+apps = { 'zubov' : '/home/meerkat/work/frontik-www/frontik_www',
+                'proxy': '/home/meerkat/work/partner_proxy' }
+
+use_standart_doc = False
+
+debug = True
+debug_login = "hh"
+debug_password = "12345"
+
+

src/frontik_srv.py

@@ -20,6 +20,10 @@
     tornado.options.define('apps', {}, dict)
     tornado.options.define('suppressed_loggers', ['tornado.httpclient'], list)
     tornado.options.define('handlers_count', 100, int)
+
+    tornado.options.define('syslog_address', "/dev/log", str)
+    tornado.options.define('syslog', False, bool)
+
     tornado.options.define('debug', False, bool)
     tornado.options.define('debug_login', None, str)
     tornado.options.define('debug_password', None, str)
@@ -38,4 +42,3 @@
         sys.exit(1)
 
     tornado_util.server.main(app)
-