Changeset 7189
- Timestamp:
- 12/14/11 16:42:12 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 19 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab 3.3 Services.sln
r7170 r7189 43 43 DefaultWebSiteLanguage = "Visual C#" 44 44 EndProjectSection 45 EndProject 46 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.JanitorService-3.3", "HeuristicLab.Services.Hive.JanitorService\3.3\HeuristicLab.Services.Hive.JanitorService-3.3.csproj", "{F685556B-F6EB-4143-8E7E-662D00FDD299}" 47 EndProject 48 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Services.Hive.JanitorServiceSetup-3.3", "HeuristicLab.Services.Hive.JanitorServiceSetup\HeuristicLab.Services.Hive.JanitorServiceSetup-3.3.vdproj", "{034C2EE4-E303-4E45-98AB-F0074EC83B81}" 45 49 EndProject 46 50 Global … … 118 122 {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|x86.Build.0 = Release|x86 119 123 {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 124 {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|Any CPU.Build.0 = Debug|Any CPU 120 125 {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|x64.ActiveCfg = Debug|Any CPU 121 126 {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|x86.ActiveCfg = Debug|Any CPU … … 123 128 {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Release|x64.ActiveCfg = Debug|Any CPU 124 129 {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Release|x86.ActiveCfg = Debug|Any CPU 130 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 131 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|Any CPU.Build.0 = Debug|Any CPU 132 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x64.ActiveCfg = Debug|x64 133 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x64.Build.0 = Debug|x64 134 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x86.ActiveCfg = Debug|x86 135 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x86.Build.0 = Debug|x86 136 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|Any CPU.ActiveCfg = Release|Any CPU 137 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|Any CPU.Build.0 = Release|Any CPU 138 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x64.ActiveCfg = Release|x64 139 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x64.Build.0 = Release|x64 140 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.ActiveCfg = Release|x86 141 {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.Build.0 = Release|x86 142 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.ActiveCfg = Debug 143 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.Build.0 = Debug 144 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x64.ActiveCfg = Debug 145 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x64.Build.0 = Debug 146 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x86.ActiveCfg = Debug 147 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x86.Build.0 = Debug 148 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|Any CPU.ActiveCfg = Release 149 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|Any CPU.Build.0 = Release 150 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x64.ActiveCfg = Release 151 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x64.Build.0 = Release 152 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x86.ActiveCfg = Release 153 {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x86.Build.0 = Release 125 154 EndGlobalSection 126 155 GlobalSection(SolutionProperties) = preSolution -
trunk/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj
r6983 r7189 136 136 <Compile Include="DataTransfer\UserStatistics.cs" /> 137 137 <Compile Include="HiveDao.cs" /> 138 <Compile Include="HiveJanitor.cs" /> 138 139 <Compile Include="Interfaces\IHiveDao.cs" /> 139 140 <Compile Include="Interfaces\IUserManager.cs" /> 140 141 <Compile Include="Manager\UserManager.cs" /> 141 142 <Compile Include="Settings.cs" /> 143 <None Include="app.config" /> 142 144 <None Include="Plugin.cs.frame" /> 143 145 <None Include="Properties\AssemblyInfo.cs.frame" /> -
trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs
r7187 r7189 396 396 public List<MessageContainer> Heartbeat(Heartbeat heartbeat) { 397 397 authen.AuthenticateForAnyRole(HiveRoles.Slave); 398 TriggerEventManager(false); 399 return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat)); 398 399 List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat)); 400 401 if (HeuristicLab.Services.Hive.Properties.Settings.Default.TriggerEventManagerInHeartbeat) { 402 TriggerEventManager(false); 403 } 404 405 return result; 400 406 } 401 407 #endregion … … 562 568 trans.UseTransaction(() => { 563 569 DateTime lastCleanup = dao.GetLastCleanup(); 564 if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(140)) {570 if (force || DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) { 565 571 dao.SetLastCleanup(DateTime.Now); 566 572 cleanup = true; -
trunk/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs
r6983 r7189 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319.23 54 // Runtime Version:4.0.30319.239 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 26 26 [global::System.Configuration.ApplicationScopedSettingAttribute()] 27 27 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 28 [global::System.Configuration.DefaultSettingValueAttribute("00:0 1:00")]28 [global::System.Configuration.DefaultSettingValueAttribute("00:03:00")] 29 29 public global::System.TimeSpan SlaveHeartbeatTimeout { 30 30 get { … … 50 50 } 51 51 } 52 53 [global::System.Configuration.ApplicationScopedSettingAttribute()] 54 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 55 [global::System.Configuration.DefaultSettingValueAttribute("False")] 56 public bool TriggerEventManagerInHeartbeat { 57 get { 58 return ((bool)(this["TriggerEventManagerInHeartbeat"])); 59 } 60 } 61 62 [global::System.Configuration.ApplicationScopedSettingAttribute()] 63 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 64 [global::System.Configuration.DefaultSettingValueAttribute("00:03:00")] 65 public global::System.TimeSpan CleanupInterval { 66 get { 67 return ((global::System.TimeSpan)(this["CleanupInterval"])); 68 } 69 } 52 70 } 53 71 } -
trunk/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.settings
r6983 r7189 1 1 <?xml version='1.0' encoding='utf-8'?> 2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Services.Hive. Common" GeneratedClassName="Settings">2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Services.Hive.Properties" GeneratedClassName="Settings"> 3 3 <Profiles /> 4 4 <Settings> 5 5 <Setting Name="SlaveHeartbeatTimeout" Type="System.TimeSpan" Scope="Application"> 6 <Value Profile="(Default)">00:0 1:00</Value>6 <Value Profile="(Default)">00:03:00</Value> 7 7 </Setting> 8 8 <Setting Name="CalculatingJobHeartbeatTimeout" Type="System.TimeSpan" Scope="Application"> … … 12 12 <Value Profile="(Default)">00:05:30</Value> 13 13 </Setting> 14 <Setting Name="TriggerEventManagerInHeartbeat" Type="System.Boolean" Scope="Application"> 15 <Value Profile="(Default)">False</Value> 16 </Setting> 17 <Setting Name="CleanupInterval" Type="System.TimeSpan" Scope="Application"> 18 <Value Profile="(Default)">00:03:00</Value> 19 </Setting> 14 20 </Settings> 15 21 </SettingsFile>
Note: See TracChangeset
for help on using the changeset viewer.