Fixed the status so we can run commands with the runner without affec…

…ting the status output
duplicati · Mar 23, 2014 · 20f12f6 · 20f12f6
1 parent 603e32c
commit 20f12f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Duplicati/Server/Program.cs b/Duplicati/Server/Program.cs
@@ -330,7 +330,7 @@ public static void Main(string[] args)
                 LiveControl.ThreadPriorityChanged += new EventHandler(LiveControl_ThreadPriorityChanged);
                 LiveControl.ThrottleSpeedChanged += new EventHandler(LiveControl_ThrottleSpeedChanged);
 
-                Program.WorkThread = new Duplicati.Library.Utility.WorkerThread<Runner.IRunnerData>((x) => { Runner.Run(x); }, LiveControl.State == LiveControls.LiveControlState.Paused);
+                Program.WorkThread = new Duplicati.Library.Utility.WorkerThread<Runner.IRunnerData>((x) => { Runner.Run(x, true); }, LiveControl.State == LiveControls.LiveControlState.Paused);
                 Program.Scheduler = new Scheduler(WorkThread);
 
                 Program.WorkThread.StartingWork += new EventHandler(SignalNewEvent);

diff --git a/Duplicati/Server/Runner.cs b/Duplicati/Server/Runner.cs
@@ -235,16 +235,19 @@ public Duplicati.Library.Main.IOperationProgress OperationProgress
             #endregion
         }
 
-        public static Duplicati.Library.Interface.IBasicResults Run(IRunnerData data, bool throwEx = false)
+        public static Duplicati.Library.Interface.IBasicResults Run(IRunnerData data, bool fromQueue)
         {
             Duplicati.Server.Serialization.Interface.IBackup backup = data.Backup;
 
             try
             {                
                 var options = ApplyOptions(backup, data.Operation, GetCommonOptions(backup, data.Operation));
                 var sink = new MessageSink(data.TaskID, backup.ID);
-                Program.GenerateProgressState = () => sink.Copy();
-                Program.StatusEventNotifyer.SignalNewEvent();            
+                if (fromQueue) 
+                {
+                    Program.GenerateProgressState = () => sink.Copy();
+                    Program.StatusEventNotifyer.SignalNewEvent();            
+                }
 
                 if (data.ExtraOptions != null)
                     foreach(var k in data.ExtraOptions)
@@ -308,7 +311,7 @@ public static Duplicati.Library.Interface.IBasicResults Run(IRunnerData data, bo
                 Program.DataConnection.LogError(data.Backup.ID, string.Format("Failed while executing \"{0}\" with id: {1}", data.Operation, data.Backup.ID), ex);
                 //TODO: Update metadata with the error here
 
-                if (throwEx)
+                if (!fromQueue)
                     throw;
 
                 return null;

diff --git a/Duplicati/Server/WebServer.cs b/Duplicati/Server/WebServer.cs
@@ -432,7 +432,7 @@ private void ListBackupSets(HttpServer.IHttpRequest request, HttpServer.IHttpRes
                 }
 
 
-                var r = Runner.Run(Runner.CreateTask(DuplicatiOperation.List, bk), true) as Duplicati.Library.Interface.IListResults;
+                var r = Runner.Run(Runner.CreateTask(DuplicatiOperation.List, bk), false) as Duplicati.Library.Interface.IListResults;
 
                 OutputObject(bw, r.Filesets);
             }
@@ -463,7 +463,7 @@ private void SearchBackupFiles(HttpServer.IHttpRequest request, HttpServer.IHttp
                 if (!allversion)
                     time = Duplicati.Library.Utility.Timeparser.ParseTimeInterval(timestring, DateTime.Now);
 
-                var r = Runner.Run(Runner.CreateListTask(bk, filter, prefixonly, allversion, foldercontents, time), true) as Duplicati.Library.Interface.IListResults;
+                var r = Runner.Run(Runner.CreateListTask(bk, filter, prefixonly, allversion, foldercontents, time), false) as Duplicati.Library.Interface.IListResults;
 
                 var result = new Dictionary<string, object>();