Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 13:54:57 (13 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:
branches/HeuristicLab.Hive.Azure
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj

    r7019 r7215  
    8282    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    8383  </PropertyGroup>
    84   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLocal|AnyCPU'">
    85     <DebugSymbols>true</DebugSymbols>
    86     <OutputPath>..\..\bin\</OutputPath>
    87     <DefineConstants>DEBUG;TRACE</DefineConstants>
    88     <DebugType>full</DebugType>
    89     <PlatformTarget>AnyCPU</PlatformTarget>
    90     <CodeAnalysisLogFile>C:\dev\HeursticLab.Azure\\bin\HeuristicLab.Clients.Hive.Slave.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    91     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    92     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    93     <ErrorReport>prompt</ErrorReport>
    94     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    95     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    96     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    97   </PropertyGroup>
    98   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLocal|x86'">
    99     <DebugSymbols>true</DebugSymbols>
    100     <OutputPath>bin\x86\DebugLocal\</OutputPath>
    101     <DefineConstants>DEBUG;TRACE</DefineConstants>
    102     <DebugType>full</DebugType>
    103     <PlatformTarget>x86</PlatformTarget>
    104     <CodeAnalysisLogFile>C:\dev\HeursticLab.Azure\\bin\HeuristicLab.Clients.Hive.Slave.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    105     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    106     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    107     <ErrorReport>prompt</ErrorReport>
    108     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    109     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    110     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    111   </PropertyGroup>
    112   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLocal|x64'">
    113     <DebugSymbols>true</DebugSymbols>
    114     <OutputPath>bin\x64\DebugLocal\</OutputPath>
    115     <DefineConstants>DEBUG;TRACE</DefineConstants>
    116     <DebugType>full</DebugType>
    117     <PlatformTarget>x64</PlatformTarget>
    118     <CodeAnalysisLogFile>C:\dev\HeursticLab.Azure\\bin\HeuristicLab.Clients.Hive.Slave.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    119     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    120     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    121     <ErrorReport>prompt</ErrorReport>
    122     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    123     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    124     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    125   </PropertyGroup>
    126   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugServices|AnyCPU'">
    127     <DebugSymbols>true</DebugSymbols>
    128     <OutputPath>..\..\bin\</OutputPath>
    129     <DefineConstants>DEBUG;TRACE</DefineConstants>
    130     <DebugType>full</DebugType>
    131     <PlatformTarget>AnyCPU</PlatformTarget>
    132     <CodeAnalysisLogFile>C:\dev\HeursticLab.Azure\\bin\HeuristicLab.Clients.Hive.Slave.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    133     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    134     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    135     <ErrorReport>prompt</ErrorReport>
    136     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    137     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    138     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    139   </PropertyGroup>
    140   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugServices|x86'">
    141     <DebugSymbols>true</DebugSymbols>
    142     <OutputPath>bin\x86\DebugServices\</OutputPath>
    143     <DefineConstants>DEBUG;TRACE</DefineConstants>
    144     <DebugType>full</DebugType>
    145     <PlatformTarget>x86</PlatformTarget>
    146     <CodeAnalysisLogFile>C:\dev\HeursticLab.Azure\\bin\HeuristicLab.Clients.Hive.Slave.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    147     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    148     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    149     <ErrorReport>prompt</ErrorReport>
    150     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    151     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    152     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    153     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    154   </PropertyGroup>
    155   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugServices|x64'">
    156     <DebugSymbols>true</DebugSymbols>
    157     <OutputPath>bin\x64\DebugServices\</OutputPath>
    158     <DefineConstants>DEBUG;TRACE</DefineConstants>
    159     <DebugType>full</DebugType>
    160     <PlatformTarget>x64</PlatformTarget>
    161     <CodeAnalysisLogFile>C:\dev\HeursticLab.Azure\\bin\HeuristicLab.Clients.Hive.Slave.Views-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    162     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    163     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    164     <ErrorReport>prompt</ErrorReport>
    165     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    166     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    167     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
    168     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    169     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
    170     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
    171   </PropertyGroup>
    17284  <ItemGroup>
    17385    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.Designer.cs

    r6983 r7215  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.txtLog = new System.Windows.Forms.TextBox();
    4847      this.chkShowBalloonTips = new System.Windows.Forms.CheckBox();
     48      this.hlLogView = new HeuristicLab.Core.Views.LogView();
    4949      this.SuspendLayout();
    50       //
    51       // txtLog
    52       //
    53       this.txtLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    54                   | System.Windows.Forms.AnchorStyles.Left)
    55                   | System.Windows.Forms.AnchorStyles.Right)));
    56       this.txtLog.BackColor = System.Drawing.Color.White;
    57       this.txtLog.Location = new System.Drawing.Point(3, 3);
    58       this.txtLog.Multiline = true;
    59       this.txtLog.Name = "txtLog";
    60       this.txtLog.ReadOnly = true;
    61       this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
    62       this.txtLog.Size = new System.Drawing.Size(480, 238);
    63       this.txtLog.TabIndex = 2;
    6450      //
    6551      // chkShowBalloonTips
    … …  
    7561      this.chkShowBalloonTips.CheckedChanged += new System.EventHandler(this.chkShowBalloonTips_CheckedChanged);
    7662      //
     63      // hlLogView
     64      //
     65      this.hlLogView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     66                  | System.Windows.Forms.AnchorStyles.Left)
     67                  | System.Windows.Forms.AnchorStyles.Right)));
     68      this.hlLogView.Caption = "Log View";
     69      this.hlLogView.Content = null;
     70      this.hlLogView.Location = new System.Drawing.Point(3, 3);
     71      this.hlLogView.Name = "hlLogView";
     72      this.hlLogView.ReadOnly = false;
     73      this.hlLogView.Size = new System.Drawing.Size(480, 238);
     74      this.hlLogView.TabIndex = 4;
     75      //
    7776      // LogView
    7877      //
    7978      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    8079      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     80      this.Controls.Add(this.hlLogView);
    8181      this.Controls.Add(this.chkShowBalloonTips);
    82       this.Controls.Add(this.txtLog);
    8382      this.Name = "LogView";
    8483      this.Size = new System.Drawing.Size(486, 267);
    … …  
    9190    #endregion
    9291
    93     private System.Windows.Forms.TextBox txtLog;
    9492    private System.Windows.Forms.CheckBox chkShowBalloonTips;
     93    private HeuristicLab.Core.Views.LogView hlLogView;
    9594  }
    9695}

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.cs

    r6983 r7215  
    2424using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties;
    2525using HeuristicLab.Common;
     26using HeuristicLab.Core;
    2627using HeuristicLab.Core.Views;
    2728using HeuristicLab.MainForm;
    … …  
    4041    }
    4142
     43    private ILog log;
     44
    4245    public LogView() {
    4346      InitializeComponent();
     47      log = new ThreadSafeLog(Settings.Default.MaxLogCount);
     48      hlLogView.Content = log;
    4449    }
    4550
    … …  
    5863    #endregion
    5964
    60 
    6165    protected override void OnContentChanged() {
    6266      base.OnContentChanged();
    … …  
    6973    #region Event Handlers
    7074    void Content_SlaveMessageLogged(object sender, EventArgs<string> e) {
    71       string msg = string.Format("{0}: {1} {2}", DateTime.Now.ToString("HH:mm:ss"), e.Value, Environment.NewLine);
    72 
    73       if (txtLog.InvokeRequired) {
    74         txtLog.Invoke(new Action<string>(txtLog.AppendText), msg);
    75       } else {
    76         txtLog.AppendText(msg);
    77       }
     75      log.LogMessage(e.Value);
    7876    }
    7977

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/Settings.Designer.cs

    r6983 r7215  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.235
     4//     Runtime Version:4.0.30319.239
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    6262        [global::System.Configuration.UserScopedSettingAttribute()]
    6363        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    64         [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore.WindowsService")]
     64        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.Slave")]
    6565        public string ServiceName {
    6666            get {
    … …  
    7171            }
    7272        }
     73       
     74        [global::System.Configuration.UserScopedSettingAttribute()]
     75        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     76        [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
     77        public global::System.TimeSpan ServiceStartStopTimeout {
     78            get {
     79                return ((global::System.TimeSpan)(this["ServiceStartStopTimeout"]));
     80            }
     81            set {
     82                this["ServiceStartStopTimeout"] = value;
     83            }
     84        }
     85       
     86        [global::System.Configuration.UserScopedSettingAttribute()]
     87        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     88        [global::System.Configuration.DefaultSettingValueAttribute("00:00:03")]
     89        public global::System.TimeSpan ServiceReconnectTimeout {
     90            get {
     91                return ((global::System.TimeSpan)(this["ServiceReconnectTimeout"]));
     92            }
     93            set {
     94                this["ServiceReconnectTimeout"] = value;
     95            }
     96        }
     97       
     98        [global::System.Configuration.ApplicationScopedSettingAttribute()]
     99        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     100        [global::System.Configuration.DefaultSettingValueAttribute("1000")]
     101        public int MaxLogCount {
     102            get {
     103                return ((int)(this["MaxLogCount"]));
     104            }
     105        }
    73106    }
    74107}

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/Settings.settings

    r6983 r7215  
    1313    </Setting>
    1414    <Setting Name="ServiceName" Type="System.String" Scope="User">
    15       <Value Profile="(Default)">HeuristicLab.Clients.Hive.SlaveCore.WindowsService</Value>
     15      <Value Profile="(Default)">HeuristicLab.Clients.Hive.Slave</Value>
     16    </Setting>
     17    <Setting Name="ServiceStartStopTimeout" Type="System.TimeSpan" Scope="User">
     18      <Value Profile="(Default)">00:00:20</Value>
     19    </Setting>
     20    <Setting Name="ServiceReconnectTimeout" Type="System.TimeSpan" Scope="User">
     21      <Value Profile="(Default)">00:00:03</Value>
     22    </Setting>
     23    <Setting Name="MaxLogCount" Type="System.Int32" Scope="Application">
     24      <Value Profile="(Default)">1000</Value>
    1625    </Setting>
    1726  </Settings>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.cs

    r6983 r7215  
    7676    #region Event Handlers
    7777    protected virtual void Content_SlaveDisplayStateChanged(object sender, EventArgs<SlaveDisplayStat> e) {
    78       lastSlaveDisplayStat = e.Value;
     78      if (this.InvokeRequired) {
     79        Action<object, EventArgs<SlaveDisplayStat>> action = new Action<object, EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
     80        Invoke(action, sender, e);
     81      } else {
     82        lastSlaveDisplayStat = e.Value;
     83        if (e.Value == SlaveDisplayStat.Asleep || e.Value == SlaveDisplayStat.NoService) {
     84          btnStart.Enabled = true;
     85          btnStop.Enabled = false;
     86        }
    7987
    80       if (e.Value == SlaveDisplayStat.Asleep || e.Value == SlaveDisplayStat.NoService) {
    81         btnStart.Enabled = true;
    82         btnStop.Enabled = false;
    83       }
    84 
    85       if (e.Value == SlaveDisplayStat.Busy || e.Value == SlaveDisplayStat.Idle || e.Value == SlaveDisplayStat.Offline) {
    86         btnStart.Enabled = false;
    87         btnStop.Enabled = true;
     88        if (e.Value == SlaveDisplayStat.Busy || e.Value == SlaveDisplayStat.Idle || e.Value == SlaveDisplayStat.Offline) {
     89          btnStart.Enabled = false;
     90          btnStop.Enabled = true;
     91        }
    8892      }
    8993    }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs

    r6983 r7215  
    126126
    127127    private void StartService() {
    128       TimeSpan timeout = TimeSpan.FromMilliseconds(5000);
    129 
    130128      ServiceController service = new ServiceController(serviceName);
    131129      try {
    132130        if (service.Status == ServiceControllerStatus.Running) {
    133131          service.Stop();
    134           service.WaitForStatus(ServiceControllerStatus.Stopped, timeout);
     132          service.WaitForStatus(ServiceControllerStatus.Stopped, Settings.Default.ServiceStartStopTimeout);
    135133        }
    136134
    137135        service.Start();
    138         service.WaitForStatus(ServiceControllerStatus.Running, timeout);
     136        service.WaitForStatus(ServiceControllerStatus.Running, Settings.Default.ServiceStartStopTimeout);
    139137      }
    140138      catch (InvalidOperationException ex) {
    … …  
    147145
    148146    private void StopService() {
    149       TimeSpan timeout = TimeSpan.FromMilliseconds(7000);
    150 
    151147      ServiceController service = new ServiceController(serviceName);
    152148      try {
    153149        if (service.Status == ServiceControllerStatus.Running) {
    154150          service.Stop();
    155           service.WaitForStatus(ServiceControllerStatus.Stopped, timeout);
     151          service.WaitForStatus(ServiceControllerStatus.Stopped, Settings.Default.ServiceStartStopTimeout);
    156152        }
    157153      }
    158154      catch (InvalidOperationException ex) {
    159         MessageBox.Show("Error starting service: Hive Slave Service not found!" + Environment.NewLine + ex.ToString());
     155        MessageBox.Show("Error stopping service: Hive Slave Service not found!" + Environment.NewLine + ex.ToString());
    160156      }
    161157      catch (Exception ex) {
    162         MessageBox.Show("Error starting service, exception is: " + Environment.NewLine + ex.ToString());
     158        MessageBox.Show("Error stopping service, exception is: " + Environment.NewLine + ex.ToString());
    163159      }
    164160    }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveItem.cs

    r6983 r7215  
    4242  }
    4343
    44   [CallbackBehavior(ConcurrencyMode = ConcurrencyMode.Reentrant)]
     44  [CallbackBehavior(ConcurrencyMode = ConcurrencyMode.Reentrant, UseSynchronizationContext = false)]
    4545  [Item("SlaveItem", "Represents a slave which receives messages from the core")]
    4646  public class SlaveItem : Item, ISlaveCommunicationCallbacks, IDisposable {
    … …  
    9191    public bool ReconnectToSlaveCore() {
    9292      try {
     93        DeregisterEvents();
    9394        pipeProxy = pipeFactory.CreateChannel();
    9495        StatusCommons st = pipeProxy.Subscribe();
    9596        if (st != null) {
     97          RegisterEvents();
    9698          OnStatusChanged(st);
    9799          return true;

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs

    r6983 r7215  
    6262    protected override void DeregisterContentEvents() {
    6363      Content.CoreConnectionChanged -= new EventHandler<Common.EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
     64      Content.SlaveDisplayStateChanged -= new EventHandler<Common.EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
    6465      base.DeregisterContentEvents();
    6566    }
    … …  
    6869      base.RegisterContentEvents();
    6970      Content.CoreConnectionChanged += new EventHandler<Common.EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
     71      Content.SlaveDisplayStateChanged += new EventHandler<Common.EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
     72    }
     73
     74    void Content_SlaveDisplayStateChanged(object sender, Common.EventArgs<SlaveDisplayStat> e) {
     75      if (e.Value == SlaveDisplayStat.NoService) {
     76        Task.Factory.StartNew(Connector);
     77      }
    7078    }
    7179
    7280    void Content_CoreConnectionChanged(object sender, Common.EventArgs<CoreConnection> e) {
    7381      if (e.Value == CoreConnection.Offline) {
    74         Connector();
     82        Task.Factory.StartNew(Connector);
    7583      }
    7684    }
    … …  
    119127
    120128        if (!connected) {
    121           Thread.Sleep(1000);
     129          Thread.Sleep(Settings.Default.ServiceReconnectTimeout);
    122130        }
    123131      }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Views/3.3/app.config

    r6983 r7215  
    44        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    55            <section name="HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6        </sectionGroup>
     7        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     8            <section name="HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    69        </sectionGroup>
    710    </configSections>
    … …  
    1720                <value>SlaveCommunicationServiceEndpoint</value>
    1821            </setting>
     22            <setting name="ServiceName" serializeAs="String">
     23                <value>HeuristicLab.Clients.Hive.Slave</value>
     24            </setting>
     25            <setting name="ServiceStartStopTimeout" serializeAs="String">
     26                <value>00:00:20</value>
     27            </setting>
     28            <setting name="ServiceReconnectTimeout" serializeAs="String">
     29                <value>00:00:03</value>
     30            </setting>
    1931        </HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings>
    2032    </userSettings>
     33    <applicationSettings>
     34        <HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings>
     35            <setting name="MaxLogCount" serializeAs="String">
     36                <value>1000</value>
     37            </setting>
     38        </HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings>
     39    </applicationSettings>
    2140</configuration>
Note: See TracChangeset for help on using the changeset viewer.