Fixes a few minor logging issues

lithnet · Sep 19, 2017 · 0ffee1a · 0ffee1a
1 parent bb603b6
commit 0ffee1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Lithnet.Miiserver.AutoSync/MAInterface/MAController.cs b/src/Lithnet.Miiserver.AutoSync/MAInterface/MAController.cs
@@ -1255,7 +1255,7 @@ internal void AddPendingActionIfNotQueued(string runProfileName, string source)
         {
             this.AddPendingActionIfNotQueued(new ExecutionParameters(runProfileName), source);
         }
-
+        
         internal void AddPendingActionIfNotQueued(ExecutionParameters p, string source, bool runNext = false)
         {
             try
@@ -1337,7 +1337,16 @@ private string GetQueueItemNames(bool includeExecuting = true)
 
             if (includeExecuting && this.ExecutingRunProfile != null)
             {
-                return string.Join(",", this.ExecutingRunProfile + "*", queuedNames);
+                string current = this.ExecutingRunProfile + "*";
+
+                if (string.IsNullOrWhiteSpace(queuedNames))
+                {
+                    return current;
+                }
+                else
+                {
+                    return string.Join(",", current, queuedNames);
+                }
             }
             else
             {

diff --git a/src/Lithnet.Miiserver.AutoSync/Triggers/FimServicePendingImportTrigger.cs b/src/Lithnet.Miiserver.AutoSync/Triggers/FimServicePendingImportTrigger.cs
@@ -46,7 +46,7 @@ private void CheckTimer_Elapsed(object sender, ElapsedEventArgs e)
                 else
                 {
                     xpath = string.Format("/Request[msidmCompletedTime > '{0}']", this.lastCheckDateTime.Value.ToResourceManagementServiceDateFormat(false));
-                    Trace.WriteLine("Searching for changes since {0}", this.lastCheckDateTime.Value.ToResourceManagementServiceDateFormat(false));
+                    Trace.WriteLine($"Searching for changes since {this.lastCheckDateTime.Value.ToResourceManagementServiceDateFormat(false)}");
                 }
 
                 ISearchResultCollection r = c.GetResources(xpath, 1, new[] { "msidmCompletedTime" }, "msidmCompletedTime", false);