Changeset 944 for trunk/sources

Timestamp:

12/10/08 14:48:49 (16 years ago)

Author:

kgrading

Message:

finished implementation for #425

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/WcfService.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/ClientConsoleService/ClientConsoleCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Properties/Settings.Designer.cs (added)
• HeuristicLab.Hive.Client.Core/Properties/Settings.settings (added)
• HeuristicLab.Hive.Client.Core/Settings.cs (added)
• HeuristicLab.Hive.Client.Core/app.config (added)
• HeuristicLab.sln (modified) (1 diff)
• HeuristicLab/MergeConfigs.cmd (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

@@ -58 +58 @@
 
     public void Connect(String serverIP, int serverPort) {
-      if(!(this.ServerIP == serverIP) && !(this.ServerPort == ServerPort))
+      if(this.ServerIP != serverIP || this.ServerPort != ServerPort)
         ServerChanged(this, new EventArgs());
       this.ServerIP = serverIP;
-      this.ServerPort = serverPort;
+      this.ServerPort = serverPort;      
       Connect();
     }

trunk/sources/HeuristicLab.Hive.Client.Core/ClientConsoleService/ClientConsoleCommunicator.cs

@@ -20 +20 @@
 
     public void SetConnection(ConnectionContainer container) {
+      ConfigManager.Instance.SetServerIPAndPort(container);
       WcfService.Instance.Connect(container.IPAdress, container.Port);
     }

trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs

@@ -28 +28 @@
 using HeuristicLab.Hive.Client.Core.ClientConsoleService;
 using HeuristicLab.Hive.Client.Communication;
+using HeuristicLab.Hive.Client.Core.Properties;
 
 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
@@ -53 +54 @@
       //retrive GUID from XML file, or burn in hell. as in hell. not heaven.
       //this won't work this way. We need a plugin for XML Handling.      
-      hardwareInfo = new ClientInfo();
-      hardwareInfo.ClientId = Guid.NewGuid();
+      hardwareInfo = new ClientInfo();      
+
+      if (Settings.Default.Guid == Guid.Empty)
+        hardwareInfo.ClientId = Guid.NewGuid();
+      else
+        hardwareInfo.ClientId = Settings.Default.Guid;
+      
       hardwareInfo.NrOfCores = Environment.ProcessorCount;
       hardwareInfo.Memory = 1024;
@@ -62 +68 @@
     public ClientInfo GetClientInfo() {
       return hardwareInfo;          
+    }
+
+    public ConnectionContainer GetServerIPAndPort() {
+      ConnectionContainer cc = new ConnectionContainer();
+      cc.IPAdress = Settings.Default.ServerIP;
+      cc.Port = Settings.Default.ServerPort;
+      return cc;
+    }
+
+    public void SetServerIPAndPort(ConnectionContainer cc) {
+      Settings.Default.ServerIP = cc.IPAdress;
+      Settings.Default.ServerPort = cc.Port;
     }
 
@@ -82 +100 @@
       return st;      
     }
-
-    public void Loggedin() {
-      if (hardwareInfo == null) {
-        hardwareInfo = new ClientInfo();
-      }
-      hardwareInfo.Login = DateTime.Now;
-    }
   }
 }

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -62 +62 @@
 
       wcfService = WcfService.Instance;
-      wcfService.Connect("10.20.53.1", 9000);
-
+      ConnectionContainer cc = ConfigManager.Instance.GetServerIPAndPort();
+      if (cc.IPAdress == String.Empty || cc.Port == 0) {
+        wcfService.Connect("10.20.53.3", 9000);
+      }
       wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
       wcfService.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(wcfService_PullJobCompleted);
@@ -136 +138 @@
     void wcfService_LoginCompleted(object sender, LoginCompletedEventArgs e) {
       if (e.Result.Success) {
-        Logging.GetInstance().Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);
-        ConfigManager.Instance.Loggedin();        
+        Logging.GetInstance().Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);        
       } else
         Logging.GetInstance().Error(this.ToString(), e.Result.StatusMessage);

trunk/sources/HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj

@@ -83 +83 @@
     <Compile Include="Heartbeat.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.sln

@@ -931 +931 @@
     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.CEDMA Debug|x86.ActiveCfg = Debug|x86
     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.ActiveCfg = Debug|x86
     {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Debug|x86.Build.0 = Debug|x86

trunk/sources/HeuristicLab/MergeConfigs.cmd

@@ -1 +1 @@
 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\%Outdir%\HeuristicLab.PluginInfrastructure.dll.config" "HeuristicLab.exe.config"
 ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure.GUI\%Outdir%\HeuristicLab.PluginInfrastructure.GUI.dll.config" "HeuristicLab.exe.config"
+ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Client.Core\%Outdir%\HeuristicLab.Hive.Client.Core-3.2.dll.config" "HeuristicLab.exe.config"