Changeset 3048 for box/trunk/lib

Timestamp:

12/12/2011 23:36:25 (5 months ago)

Author:

chris

Message:

Log the account name with connections, disconnections and statistics, requested by Pete Jalajas.

Location:

box/trunk

Files:

• . (modified) (1 prop)
• lib/backupstore/BackupCommands.cpp (modified) (4 diffs)
• lib/backupstore/BackupStoreContext.h (modified) (3 diffs)

box/trunk/lib/backupstore/BackupCommands.cpp

@@ -90 +90 @@
         {
                 BOX_WARNING("Failed login from client ID " << 
-                        BOX_FORMAT_ACCOUNT(mClientID) <<
-                        ": wrong certificate for this account");
+                        BOX_FORMAT_ACCOUNT(mClientID) << ": "
+                        "wrong certificate for this account");
                 return PROTOCOL_ERROR(Err_BadLogin);
         }
@@ -98 +98 @@
         {
                 BOX_WARNING("Failed login from client ID " << 
-                        BOX_FORMAT_ACCOUNT(mClientID) <<
-                        ": no such account on this server");
+                        BOX_FORMAT_ACCOUNT(mClientID) << ": "
+                        "no such account on this server");
                 return PROTOCOL_ERROR(Err_BadLogin);
         }
@@ -129 +129 @@
         // Log login
         BOX_NOTICE("Login from Client ID " << 
-                BOX_FORMAT_ACCOUNT(mClientID) <<
-                " " <<
+                BOX_FORMAT_ACCOUNT(mClientID) << " "
+                "(name=" << rContext.GetAccountName() << "): " <<
                 (((mFlags & Flags_ReadOnly) != Flags_ReadOnly)
                 ?"Read/Write":"Read-only"));
@@ -153 +153 @@
 {
         BOX_NOTICE("Session finished for Client ID " << 
-                BOX_FORMAT_ACCOUNT(rContext.GetClientID()));
+                BOX_FORMAT_ACCOUNT(rContext.GetClientID()) << " "
+                "(name=" << rContext.GetAccountName() << ")");
 
         // Let the context know about it

box/trunk/lib/backupstore/BackupStoreContext.h

@@ -16 +16 @@
 
 #include "autogen_BackupProtocol.h"
+#include "BackupStoreInfo.h"
 #include "BackupStoreRefCountDatabase.h"
 #include "NamedLock.h"
@@ -23 +24 @@
 class BackupStoreDirectory;
 class BackupStoreFilename;
-class BackupStoreInfo;
 class IOStream;
 class BackupProtocolMessage;
@@ -81 +81 @@
         void SaveStoreInfo(bool AllowDelay = true);
         const BackupStoreInfo &GetBackupStoreInfo() const;
+        const std::string GetAccountName()
+        {
+                if(!mapStoreInfo.get())
+                {
+                        return "Unknown";
+                }
+                return mapStoreInfo->GetAccountName();
+        }
 
         // Client marker