Improve http request logging.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeHttp.java
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java

index 320f4e102ab8df05c76f57bf703e35d0a24c9371..27083aeaba11812fd219ac60ab7e950ee3c01114 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -57,6 +57,8 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                 try {
                         httpService.registerServlet("/!", new LinkServlet(repository),
                                         null, null);
+                       httpService.registerServlet("/robots.txt", new RobotServlet(),
+                                       null, null);
                 } catch (Exception e) {
                         throw new CmsException("Cannot register filters", e);
                 }
@@ -140,16 +142,21 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                                                 .getProperty(JCR_LAST_MODIFIED).getDate() : null;
                                 String url = CmsUtils.getCanonicalUrl(node, request);
                                 String imgUrl = null;
-                               for (NodeIterator it = node.getNodes(); it.hasNext();) {
+                               loop: for (NodeIterator it = node.getNodes(); it.hasNext();) {
+                                       // Takes the first found cms:image
                                         Node child = it.nextNode();
-                                       if (child.isNodeType(CMS_IMAGE))
+                                       if (child.isNodeType(CMS_IMAGE)){
                                                 imgUrl = CmsUtils.getDataUrl(child, request);
+                                               break loop;
+                                       }
                                 }
                                 StringBuilder buf = new StringBuilder();
                                 buf.append("<html>");
                                 buf.append("<head>");
                                 writeMeta(buf, "og:title", title);
                                 writeMeta(buf, "og:type", "website");
+                               buf.append("<meta name='twitter:card' content='summary' />");
+                               buf.append("<meta name='twitter:site' content='@argeo_org' />");
                                 writeMeta(buf, "og:url", url);
                                 if (desc != null)
                                         writeMeta(buf, "og:description", desc);
@@ -203,6 +210,22 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                 }
         }
  
+       class RobotServlet extends HttpServlet {
+               private static final long serialVersionUID = 7935661175336419089L;
+
+               @Override
+               protected void service(HttpServletRequest request,
+                               HttpServletResponse response) throws ServletException,
+                               IOException {
+                       PrintWriter writer = response.getWriter();
+                       writer.append("User-agent: *\n");
+                       writer.append("Disallow:\n");
+                       response.setHeader("Content-Type", "text/plain");
+                       writer.flush();
+               }
+
+       }
+
         /** Intercepts all requests. Authenticates. */
         class RootFilter extends HttpFilter {