Merge: nitweb: use ConsoleLog middleware

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

Pull-Request: #2163
Reviewed-by: Jean Privat <jean@pryen.org>

diff --combined src/nitweb.nit
index 7eba23d,c18c740..13e3dce
--- 1/src/nitweb.nit
--- 2/src/nitweb.nit
+++ b/src/nitweb.nit
@@@ -43,64 -43,22 +43,66 @@@ private class NitwebPhas
                var model = mainmodule.model
                var modelbuilder = toolcontext.modelbuilder
  
 +              # Build catalog
 +              var catalog = new Catalog(modelbuilder)
 +              for mpackage in model.mpackages do
 +                      catalog.deps.add_node(mpackage)
 +                      for mgroup in mpackage.mgroups do
 +                              for mmodule in mgroup.mmodules do
 +                                      for imported in mmodule.in_importation.direct_greaters do
 +                                              var ip = imported.mpackage
 +                                              if ip == null or ip == mpackage then continue
 +                                              catalog.deps.add_edge(mpackage, ip)
 +                                      end
 +                              end
 +                      end
 +                      catalog.git_info(mpackage)
 +                      catalog.package_page(mpackage)
 +              end
 +
                # Run the server
                var host = toolcontext.opt_host.value or else "localhost"
                var port = toolcontext.opt_port.value
  
                var app = new App
  
+               app.use_before("/*", new RequestClock)
 -              app.use("/api", new APIRouter(model, modelbuilder, mainmodule))
 +              app.use("/api", new APIRouter(model, modelbuilder, mainmodule, catalog))
                app.use("/doc/:namespace", new DocAction(model, mainmodule, modelbuilder))
                app.use("/*", new StaticHandler(toolcontext.share_dir / "nitweb", "index.html"))
+               app.use_after("/*", new ConsoleLog)
  
                app.listen(host, port.to_i)
        end
  end
  
 +# Group all api handlers in one router.
 +class APIRouter
 +      super Router
 +
 +      # Model to pass to handlers.
 +      var model: Model
 +
 +      # ModelBuilder to pass to handlers.
 +      var modelbuilder: ModelBuilder
 +
 +      # Mainmodule to pass to handlers.
 +      var mainmodule: MModule
 +
 +      # Catalog to pass to handlers.
 +      var catalog: Catalog
 +
 +      init do
 +              use("/catalog", new APICatalogRouter(model, mainmodule, catalog))
 +              use("/list", new APIList(model, mainmodule))
 +              use("/search", new APISearch(model, mainmodule))
 +              use("/random", new APIRandom(model, mainmodule))
 +              use("/entity/:id", new APIEntity(model, mainmodule))
 +              use("/code/:id", new APIEntityCode(model, mainmodule, modelbuilder))
 +              use("/uml/:id", new APIEntityUML(model, mainmodule))
 +      end
 +end
 +
  # build toolcontext
  var toolcontext = new ToolContext
  var tpl = new Template