Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Abente <martin.abente.lahaye@gmail.com>2011-01-20 15:32:22 (GMT)
committer Martin Abente <martin.abente.lahaye@gmail.com>2011-01-20 15:32:22 (GMT)
commita1ce5042a8f883a450f7b782d64d7abb97931766 (patch)
treeaffb04410f5220430d7d8f9a1c7a027a7750d8cd
parentd442fb2d1bac7c0e2995f320057716e76f8800dc (diff)
Add custom logging
-rw-r--r--config.ini1
-rw-r--r--fbserver.py11
2 files changed, 12 insertions, 0 deletions
diff --git a/config.ini b/config.ini
index 7c2fcb9..517ba70 100644
--- a/config.ini
+++ b/config.ini
@@ -1,6 +1,7 @@
[server]
host: localhost
port: 8080
+log: /home/tch/Devel/feedback-server/server.log
[ssl]
pkey_file: /home/tch/Devel/feedback-server/pkey-key.pem
diff --git a/fbserver.py b/fbserver.py
index dab415a..b5a5506 100644
--- a/fbserver.py
+++ b/fbserver.py
@@ -34,10 +34,14 @@ config.read(config_path)
HOST = config.get('server', 'host')
PORT = config.getint('server', 'port')
+LOG_PATH = config.get('server', 'log')
PKEY_FILE = config.get('ssl', 'pkey_file')
CERT_FILE = config.get('ssl', 'cert_file')
REPORTS_PATH = config.get('feedback', 'reports_path')
+logging.basicConfig(filename=LOG_PATH, level=logging.INFO)
+
+
class RequestHandler(SimpleHTTPRequestHandler):
def setup(self):
@@ -70,6 +74,13 @@ class RequestHandler(SimpleHTTPRequestHandler):
logging.exception('Cannot process request')
self._reply(403, 'Cannot process request')
+ def log_message(self, format, *args):
+ timestamp = self.log_date_time_string()
+ client_addr = self.address_string()
+ message = '%s - %s: %s' % (timestamp, client_addr, (format % args))
+
+ logging.info(message)
+
def _reply(self, code, message):
self.send_response(code)
self.send_header('Content-type', 'text/html')