[llvm-commits] [zorg] r130826 - /zorg/trunk/lnt/lnt/lnttool/__init__.py

[Daniel Dunbar]

Author: ddunbar
Date: Tue May  3 20:48:39 2011
New Revision: 130826

URL: http://llvm.org/viewvc/llvm-project?rev=130826&view=rev
Log:
lnt runserver: Switch --use-flask-app to default.

Modified:
    zorg/trunk/lnt/lnt/lnttool/__init__.py

Modified: zorg/trunk/lnt/lnt/lnttool/__init__.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/lnttool/__init__.py?rev=130826&r1=130825&r2=130826&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/lnttool/__init__.py (original)
+++ zorg/trunk/lnt/lnt/lnttool/__init__.py Tue May  3 20:48:39 2011
@@ -27,9 +27,6 @@
     parser.add_option("", "--processes", dest="processes", type=int,
                       metavar="N", help="number of processes to use [%default]",
                       default=1)
-    parser.add_option("", "--use-flask-app", dest="use_flask_app",
-                      help="use the Flask based UI [%default]",
-                      action="store_true", default=False)
 
     (opts, args) = parser.parse_args(args)
     if len(args) != 1:
@@ -46,23 +43,16 @@
     if not config or not os.path.exists(config):
         raise SystemExit,"error: invalid config: %r" % config
 
-    if opts.use_flask_app:
-        import lnt.server.ui.app
-        instance = lnt.server.ui.app.App.create_standalone(
-            config_path = config)
-        if opts.debugger:
-            instance.debug = True
-        instance.run(opts.hostname, opts.port,
-                     use_reloader = opts.reloader,
-                     use_debugger = opts.debugger,
-                     threaded = opts.threaded,
-                     processes = opts.processes)
-    else:
-        from werkzeug import run_simple
-        from lnt.viewer import app
-        run_simple(opts.hostname, opts.port, app.create_app(config),
-                   opts.reloader, opts.debugger,
-                   False, None, 1, opts.threaded, opts.processes)
+    import lnt.server.ui.app
+    instance = lnt.server.ui.app.App.create_standalone(
+        config_path = config)
+    if opts.debugger:
+        instance.debug = True
+    instance.run(opts.hostname, opts.port,
+                 use_reloader = opts.reloader,
+                 use_debugger = opts.debugger,
+                 threaded = opts.threaded,
+                 processes = opts.processes)
 
 from create import action_create
 from convert import action_convert