Changeset 11053 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.cs

Timestamp:

06/27/14 16:39:43 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.cs

@@ -9 +9 @@
   public class ExceptionDataController : Controller {
 
-    public JsonResult TaskExceptions(string userName, string limit, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState = null) {
+    public JsonResult TaskExceptions(string limit, string userName, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState = null)
+    {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
         TaskState state = GetTaskState(taskState);
         var data =
-        (from errors in db.StateLogs
-          join tasks in db.FactTasks
-            on errors.TaskId equals tasks.TaskId
+        (from tasks in db.FactTasks
           join jobs in db.DimJobs
             on tasks.JobId equals jobs.JobId
-          where jobs.UserName == userName &&
-          errors.Exception != null && 
-          !errors.Exception.Equals(string.Empty) &&
+          where tasks.Exception != null && 
+          !tasks.Exception.Equals(string.Empty) &&
+          (string.IsNullOrEmpty(userName) || jobs.UserName == userName) &&
           (!start.HasValue || tasks.StartTime >= start) &&
           (!end.HasValue || tasks.EndTime < end) &&
@@ -27 +26 @@
           select new
           {
-            TaskID = errors.TaskId,
-            ErrorMessage = errors.Exception,
+            TaskID = tasks.TaskId,
+            ErrorMessage = tasks.Exception,
             StartDate = tasks.StartTime
           }).OrderByDescending(s => s.StartDate).Take(Convert.ToInt32(limit)).ToList();
@@ -38 +37 @@
 
         return Json(new KeyValuePair<List<string>, List<string>>(Task, Error), JsonRequestBehavior.AllowGet);
+      }
+    }
+
+    public JsonResult SlaveExceptions(string limit, DateTime? start = null, DateTime? end = null, string clientId = null) {
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
+        var data =
+        (from tasks in db.FactTasks
+         join jobs in db.DimJobs
+           on tasks.JobId equals jobs.JobId
+         where tasks.Exception != null &&
+          !tasks.Exception.Equals(string.Empty) && 
+          (!start.HasValue || tasks.StartTime >= start) &&
+         (!end.HasValue || tasks.EndTime < end) &&
+         (string.IsNullOrEmpty(clientId) || tasks.LastClientId.ToString() == clientId)
+         select new {
+           TaskID = tasks.TaskId,
+           ErrorMessage = tasks.Exception,
+           ClientID = tasks.LastClientId,
+           UserName = jobs.UserName,
+           StartDate = tasks.StartTime
+         }).OrderByDescending(s => s.StartDate).Take(Convert.ToInt32(limit)).ToList();
+
+        List<List<string>> results = new List<List<string>>();
+
+        for (int i = 0; i < data.Count; i++) {
+          results.Add(
+            new List<string> { data[i].TaskID.ToString(), data[i].ErrorMessage, data[i].ClientID.ToString(), data[i].UserName,
+              data[i].StartDate.ToString("dd/MM/yyyy HH:mm")}
+          );
+        }
+        return Json(results, JsonRequestBehavior.AllowGet);
       }
     }