Import of new website.

[people/shoehn/ipfire.org.git] / www / webapp.py

diff --git a/www/webapp.py b/www/webapp.py
index bb5c16730a4bda4e1576fb156365c63eae6ba939..7f25974e59d767e7c973e9930733e90f32cd521d 100755 (executable)
--- a/www/webapp.py
+++ b/www/webapp.py
@@ -7,37 +7,28 @@ import os
 import signal
 import sys
 
-import tornado.httpserver
-import tornado.ioloop
+#import tornado.httpserver
+#import tornado.ioloop
 import tornado.options
 
 from webapp import Application
 
 tornado.options.parse_command_line()
 
-def setupLogging():
-       formatter = logging.Formatter("%(asctime)s %(levelname)8s %(message)s")
-
-       #handler = logging.handlers.RotatingFileHandler("webapp.log",
-       #       maxBytes=10*1024**2, backupCount=5)
-       handler = logging.FileHandler("webapp.log")
-
-       handler.setFormatter(formatter)
-       logging.getLogger().addHandler(handler)
-
 if __name__ == "__main__":
-       setupLogging()
        app = Application()
 
        context = daemon.DaemonContext(
                working_directory=os.getcwd(),
-               stdout=sys.stdout, stderr=sys.stderr, # XXX causes errors...
+#              stdout=sys.stdout, stderr=sys.stderr, # XXX causes errors...
        )
 
        context.signal_map = {
                signal.SIGHUP  : app.reload,
-               signal.SIGTERM : app.stop,
+               signal.SIGTERM : app.shutdown,
        }
 
-       with context:
-               app.run()
+#      with context:
+#              app.run()
+
+       app.run()