Changeset 6698 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

09/02/11 11:49:53 (13 years ago)

Author:

ascheibe

Message:

#1233

• implemented review comments
• more cleanups

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Files:

• HeuristicLab.Services.Hive-3.4.csproj (modified) (1 diff)
• HiveService.cs (modified) (4 diffs)
• Interfaces/IEventManager.cs (added)
• Interfaces/ILifecycleManager.cs (deleted)
• Interfaces/IServiceLocator.cs (modified) (1 diff)
• Manager/EventManager.cs (added)
• Manager/LifecycleManager.cs (deleted)
• ServiceLocator.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj

@@ -110 +110 @@
     <Compile Include="Manager\HeartbeatManager.cs" />
     <Compile Include="Interfaces\IAuthenticationManager.cs" />
-    <Compile Include="Interfaces\ILifecycleManager.cs" />
+    <Compile Include="Interfaces\IEventManager.cs" />
     <Compile Include="Interfaces\IServiceLocator.cs" />
     <Compile Include="Manager\AuthorizationManager.cs" />
     <Compile Include="HeuristicLabServicesHivePlugin.cs" />
-    <Compile Include="Manager\LifecycleManager.cs" />
+    <Compile Include="Manager\EventManager.cs" />
     <Compile Include="HiveRoles.cs" />
     <Compile Include="HiveService.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -48 +48 @@
       get { return ServiceLocator.Instance.TransactionManager; }
     }
-    private ILifecycleManager lifecycleManager {
-      get { return ServiceLocator.Instance.LifecycleManager; }
+    private IEventManager eventManager {
+      get { return ServiceLocator.Instance.EventManager; }
     }
     private IUserManager userManager {
@@ -382 +382 @@
     public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      TriggerLifecycle(false);
+      TriggerEventManager(false);
       return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
     }
@@ -532 +532 @@
     }
 
-    public void TriggerLifecycle(bool force) {
+    public void TriggerEventManager(bool force) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Slave);
       // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
@@ -539 +539 @@
         if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
           dao.SetLastCleanup(DateTime.Now);
-          lifecycleManager.Cleanup();
+          eventManager.Cleanup();
         }
       }, true);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IServiceLocator.cs

@@ -27 +27 @@
     IAuthorizationManager AuthorizationManager { get; }
     IHiveDao HiveDao { get; }
-    ILifecycleManager LifecycleManager { get; }
+    IEventManager EventManager { get; }
     ITransactionManager TransactionManager { get; }
     IUserManager UserManager { get; }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs

@@ -58 +58 @@
     }
 
-    private ILifecycleManager lifecycleManager;
-    public ILifecycleManager LifecycleManager {
+    private IEventManager eventManager;
+    public IEventManager EventManager {
       get {
-        if (lifecycleManager == null) lifecycleManager = new LifecycleManager();
-        return lifecycleManager;
+        if (eventManager == null) eventManager = new EventManager();
+        return eventManager;
       }
     }