haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let AddVerboseMessage() handle null / empty args variable & update PurgeFilesHandler to correctly call AddMessage()

Browse Source
This commit is contained in:
JonMikelV
2018-01-03 18:18:53 -06:00
parent 10b55ab436
commit 0e6bb62520
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Main/Operation/PurgeFilesHandler.cs
+2 -2
View File
@@ -173,13 +173,13 @@ namespace Duplicati.Library.Main.Operation
if (m_options.Dryrun)
m_result.AddDryrunMessage(msg);
else if (m_options.Verbose)
m_result.AddVerboseMessage(msg);
m_result.AddMessage(msg);
}
if (m_options.Dryrun)
m_result.AddDryrunMessage("Writing files to remote storage");
else if (m_options.Verbose)
m_result.AddVerboseMessage("Writing files to remote storage");
m_result.AddMessage("Writing files to remote storage");
}
if (m_options.Dryrun)
Duplicati/Library/Main/ResultClasses.cs
+10 -4
View File
@@ -420,10 +420,13 @@ namespace Duplicati.Library.Main
public void AddVerboseMessage(string message, params object[] args)
{
if (m_parent != null)
m_parent.AddVerboseMessage(message, args);
{
if ((args != null) && (args.Length > 0)) m_parent.AddVerboseMessage(message, args);
else m_parent.AddMessage(message);
}
else
{
lock(Logging.Log.Lock)
lock (Logging.Log.Lock)
{
if (m_is_reporting)
return;
@@ -431,10 +434,13 @@ namespace Duplicati.Library.Main
try
{
m_is_reporting = true;
Logging.Log.WriteMessage(string.Format(message, args), Duplicati.Library.Logging.LogMessageType.Profiling, null);
Logging.Log.WriteMessage((((args != null) || (args.Length > 0)) ? string.Format(message, args) : message), Duplicati.Library.Logging.LogMessageType.Profiling, null);
if (MessageSink != null)
MessageSink.VerboseEvent(message, args);
{
if ((args != null) && (args.Length > 0)) MessageSink.VerboseEvent(message, args);
else MessageSink.MessageEvent(message);
}
}
finally
{