- Timestamp:
- 09/02/11 11:49:53 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4
- Files:
-
- 2 added
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj
r6463 r6698 110 110 <Compile Include="Manager\HeartbeatManager.cs" /> 111 111 <Compile Include="Interfaces\IAuthenticationManager.cs" /> 112 <Compile Include="Interfaces\I LifecycleManager.cs" />112 <Compile Include="Interfaces\IEventManager.cs" /> 113 113 <Compile Include="Interfaces\IServiceLocator.cs" /> 114 114 <Compile Include="Manager\AuthorizationManager.cs" /> 115 115 <Compile Include="HeuristicLabServicesHivePlugin.cs" /> 116 <Compile Include="Manager\ LifecycleManager.cs" />116 <Compile Include="Manager\EventManager.cs" /> 117 117 <Compile Include="HiveRoles.cs" /> 118 118 <Compile Include="HiveService.cs" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs
r6479 r6698 48 48 get { return ServiceLocator.Instance.TransactionManager; } 49 49 } 50 private I LifecycleManager lifecycleManager {51 get { return ServiceLocator.Instance. LifecycleManager; }50 private IEventManager eventManager { 51 get { return ServiceLocator.Instance.EventManager; } 52 52 } 53 53 private IUserManager userManager { … … 382 382 public List<MessageContainer> Heartbeat(Heartbeat heartbeat) { 383 383 authen.AuthenticateForAnyRole(HiveRoles.Slave); 384 Trigger Lifecycle(false);384 TriggerEventManager(false); 385 385 return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat)); 386 386 } … … 532 532 } 533 533 534 public void Trigger Lifecycle(bool force) {534 public void TriggerEventManager(bool force) { 535 535 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Slave); 536 536 // 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)) { 540 540 dao.SetLastCleanup(DateTime.Now); 541 lifecycleManager.Cleanup();541 eventManager.Cleanup(); 542 542 } 543 543 }, true); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IServiceLocator.cs
r6463 r6698 27 27 IAuthorizationManager AuthorizationManager { get; } 28 28 IHiveDao HiveDao { get; } 29 I LifecycleManager LifecycleManager { get; }29 IEventManager EventManager { get; } 30 30 ITransactionManager TransactionManager { get; } 31 31 IUserManager UserManager { get; } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs
r6463 r6698 58 58 } 59 59 60 private I LifecycleManager lifecycleManager;61 public I LifecycleManager LifecycleManager {60 private IEventManager eventManager; 61 public IEventManager EventManager { 62 62 get { 63 if ( lifecycleManager == null) lifecycleManager = new LifecycleManager();64 return lifecycleManager;63 if (eventManager == null) eventManager = new EventManager(); 64 return eventManager; 65 65 } 66 66 }
Note: See TracChangeset
for help on using the changeset viewer.