Separates password and ma operations into separate log files

Author: ryannewington

src/Lithnet.GoogleApps.MA.Setup/Product.wxs

@@ -3,7 +3,7 @@
   <Product Id="*"
            Name="Lithnet GoogleApps Management Agent"
            Language="1033"
-           Version="1.1.5999"
+           Version="1.1.6000"
            Manufacturer="Lithnet"
            UpgradeCode="3410d571b358426281edb2990ae57cae" >
 

src/Lithnet.GoogleApps.MA.UnitTests/TestParameters.cs

@@ -139,6 +139,10 @@ public IEnumerable<string> WebsitesAttributeFixedTypes
                 this.ServiceAccountEmailAddress,
                 this.UserEmailAddress,
                 this.GetCertificate(this.KeyFilePath, this.KeyFilePassword));
+
+            public string MALogFile => Path.Combine(this.LogFilePath, "ma-operations.log");
+
+            public string PasswordOperationLogFile => Path.Combine(this.LogFilePath, "password-operations.log");
         }
     }
 }

src/Lithnet.GoogleApps.MA/Interfaces/IManagementAgentParameters.cs

@@ -41,8 +41,10 @@ internal interface IManagementAgentParameters
 
         string KeyFilePath { get; }
 
-        string LogFilePath { get; }
+        string MALogFile { get; }
 
+        string PasswordOperationLogFile { get; }
+
         bool DoNotGenerateDelta { get; }
 
         string Domain { get; }

src/Lithnet.GoogleApps.MA/ManagementAgent.cs

@@ -112,7 +112,7 @@ public void OpenExportConnection(KeyedCollection<string, ConfigParameter> config
             this.DeltaPath = Path.Combine(MAUtils.MAFolder, ManagementAgent.DeltaFile);
             this.SetHttpDebugMode();
 
-            Logger.LogPath = this.Configuration.LogFilePath;
+            Logger.LogPath = this.Configuration.MALogFile;
             Logger.WriteLine("Opening export connection");
 
             this.timer = new Stopwatch();
@@ -215,7 +215,7 @@ public void CloseExportConnection(CloseExportConnectionRunStep exportRunStep)
         public OpenImportConnectionResults OpenImportConnection(KeyedCollection<string, ConfigParameter> configParameters, Schema types, OpenImportConnectionRunStep importRunStep)
         {
             this.Configuration = new ManagementAgentParameters(configParameters);
-            Logger.LogPath = this.Configuration.LogFilePath;
+            Logger.LogPath = this.Configuration.MALogFile;
 
             this.importRunStep = importRunStep;
             this.operationSchemaTypes = types;
@@ -747,7 +747,7 @@ public void OpenPasswordConnection(KeyedCollection<string, ConfigParameter> conf
         {
             this.Configuration = new ManagementAgentParameters(configParameters);
             this.SetHttpDebugMode();
-            Logger.LogPath = this.Configuration.LogFilePath;
+            Logger.LogPath = this.Configuration.PasswordOperationLogFile;
 
             ConnectionPools.InitializePools(this.Configuration.Credentials, 1, 1, 1, 1);
         }

src/Lithnet.GoogleApps.MA/ManagementAgentParameters.cs

@@ -158,6 +158,25 @@ public string LogFilePath
             }
         }
 
+        public string MALogFile
+        {
+            get
+            {
+                string root = Path.GetDirectoryName(this.LogFilePath);
+
+                return root == null ? null : Path.Combine(root, "ma-operations.log");
+            }
+        }
+
+        public string PasswordOperationLogFile
+        {
+            get
+            {
+                string root = Path.GetDirectoryName(this.LogFilePath);
+
+                return root == null ? null : Path.Combine(root, "password-operations.log");
+            }
+        }
 
         public bool DoNotGenerateDelta
         {

src/Lithnet.GoogleApps.MA/ManagementAgentParametersBase.cs

@@ -69,7 +69,7 @@ internal abstract class ManagementAgentParametersBase
 
         protected const string WebsitesFixedTypeFormatParameter = "Websites fixed types";
 
-        protected const string LogFilePathParameter = "Log file";
+        protected const string LogFilePathParameter = "Log file path";
 
         protected static string[] RequiredScopes = new string[] 
                     {