Changeset 1746

Timestamp:

09/16/14 13:58:20 (10 years ago)

Author:

pharms

Message:

• added logging of user agent

Location:

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor

Files:

• HtmlMonitorLogManager.java (modified) (1 diff)
• HtmlMonitorOutputWriter.java (modified) (4 diffs)

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorLogManager.java

@@ -127 +127 @@
                     if (writer == null) {
                         writer = new HtmlMonitorOutputWriter
-                            (logFileBaseDir, clientInfos.getWebAppId(), clientInfos.getClientId());
+                            (logFileBaseDir, clientInfos.getWebAppId(),
+                             clientInfos.getClientId(), clientInfos.getUserAgent());
 
                         writer.init();

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java

@@ -74 +74 @@
 
     /**
+     * the user agent used by the client
+     */
+    private String userAgent;
+
+    /**
      * the log file into which all messages are currently written
      */
@@ -105 +110 @@
      * @param clientId       the ID of the client, for which this writer logs
      */
-    public HtmlMonitorOutputWriter(String logFileBaseDir, String webAppId, String clientId) {
+    public HtmlMonitorOutputWriter(String logFileBaseDir,
+                                   String webAppId,
+                                   String clientId,
+                                   String userAgent)
+    {
         if (logFileBaseDir == null) {
             this.logFileBaseDir = new File(DEFAULT_LOG_FILE_BASE_DIR);
@@ -115 +124 @@
         this.webAppId = webAppId;
         this.clientId = clientId;
+        this.userAgent = userAgent;
         
         lastUpdate = System.currentTimeMillis();
@@ -442 +452 @@
         outputWriter = new PrintWriter(new OutputStreamWriter(fis, "UTF-8"));
         outputWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        outputWriter.println("<session>");
+        outputWriter.print("<session webapp=\"");
+        outputWriter.print(StringTools.xmlEntityReplacement(this.webAppId));
+        outputWriter.print("\" clientId=\"");
+        outputWriter.print(StringTools.xmlEntityReplacement(this.clientId));
+        outputWriter.print("\" userAgent=\"");
+        outputWriter.print(StringTools.xmlEntityReplacement(this.userAgent));
+        outputWriter.println("\">");
         
         loggedGUIElements.clear();