Changeset 12765 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive

Timestamp:

07/16/15 11:50:41 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.WebApp-3.3:

• Fixed a bug which caused the PluginManager to not reload an existing plugin
• Changed Path.PathSeparator to Path.DirectorySeparatorChar

HeuristicLab.Services.Hive-3.3:

• HiveStatisticsGenerator.cs: When moving a client to another group is now recognized properly
• Fixed the 'unknown user' problem

Installers/HiveJanitorServiceInstaller.nsi:

• Added HeuristicLab.Services.Access.DataAccess.dll

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3

Files:

• HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HiveStatisticsGenerator.cs (modified) (5 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -189 +189 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Services.Access.DataAccess\3.3\HeuristicLab.Services.Access.DataAccess-3.3.csproj">
+      <Project>{0F652437-998A-4EAB-8BF1-444B5FE8CE97}</Project>
+      <Name>HeuristicLab.Services.Access.DataAccess-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Services.Access\3.3\HeuristicLab.Services.Access-3.3.csproj">
       <Project>{9FAC0B23-2730-452A-9BA0-D7CA1746C541}</Project>

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs

@@ -24 +24 @@
 using System.Data.Linq;
 using System.Linq;
+using HeuristicLab.Services.Access.DataAccess;
 using HeuristicLab.Services.Hive.DataAccess;
 using HeuristicLab.Services.Hive.DataAccess.Manager;
@@ -150 +151 @@
         }
         if (totalTasks == completedTasks) {
-          dimJob.DateCompleted = factTaskDao.GetLastCompletedTaskFromJob(dimJob.JobId);
+          dimJob.DateCompleted = factTaskDao.GetLastCompletedTaskFromJob(dimJob.JobId) ?? DateTime.Now;
         }
         dimJob.TotalTasks = totalTasks;
@@ -171 +172 @@
         join client in recentlyAddedClients on slave.ResourceId equals client.ResourceId
         where (slave.Name != client.Name
+               || slave.ParentResourceId == null && client.ResourceGroupId != null // because both can be null and null comparison
+               || slave.ParentResourceId != null && client.ResourceGroupId == null // does return no entry on the sql server
                || slave.ParentResourceId != client.ResourceGroupId
-               || slave.ParentResource.ParentResourceId != client.ResourceGroup2Id)
+               || ((slave.ParentResource != null) && slave.ParentResource.ParentResourceId != client.ResourceGroup2Id))
         select new {
           SlaveId = slave.ResourceId,
@@ -186 +189 @@
           x.Name,
           ResourceGroupId = x.ParentResourceId,
-          GroupName = x.ParentResource.Name,
-          ResourceGroup2Id = x.ParentResource.ParentResourceId,
-          GroupName2 = x.ParentResource.ParentResource.Name
+          GroupName = x.ParentResource != null ? x.ParentResource.Name : null,
+          ResourceGroup2Id = x.ParentResource != null ? x.ParentResource.ParentResourceId : null,
+          GroupName2 = x.ParentResource != null ? x.ParentResource.ParentResource != null ? x.ParentResource.ParentResource.Name : null : null
         })
         .ToList();
@@ -311 +314 @@
     private string GetUserName(Guid userId) {
       try {
-        var userManager = ServiceLocator.Instance.UserManager;
-        var user = userManager.GetUserById(userId);
-        return user != null ? user.UserName : UnknownUserName;
+        // we cannot use the ServiceLocator.Instance.UserManager since the janitor service
+        // is not hosted in the iis the MemberShip.GetUser method causes exceptions
+        // needs to be further investigated current workaround: use the authenticationcontext
+        // we could also connect to the access service to get the user name
+        using (ASPNETAuthenticationDataContext dc = new ASPNETAuthenticationDataContext()) {
+          var user = dc.aspnet_Users.SingleOrDefault(x => x.UserId == userId);
+          return user != null ? user.UserName : UnknownUserName;
+        }
       }
       catch (Exception) {