Changeset 2109 for trunk/sources

Timestamp:

06/25/09 17:31:19 (15 years ago)

Author:

aleitner

Message:

changed login, exception handling on login failed (#626)

Location:

trunk/sources/HeuristicLab.Hive.Server.Console/3.2

Files:

• HiveServerConsole.Designer.cs (modified) (1 diff)
• HiveServerConsole.cs (modified) (2 diffs)
• HiveServerManagementConsole.cs (modified) (9 diffs)
• LogonDlg.Designer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerConsole.Designer.cs

@@ -206 +206 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.BackColor = System.Drawing.Color.White;
+      this.BackColor = System.Drawing.SystemColors.Control;
       this.CancelButton = this.btnCancel;
       this.ClientSize = new System.Drawing.Size(482, 226);

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerConsole.cs

@@ -90 +90 @@
         ServiceLocator.Port = tbPort.Text;
         IServerConsoleFacade scf = ServiceLocator.GetServerConsoleFacade();
+        Response resp;
         try {
           lblError.Text = "Trying to logon...";
+          this.Cursor = Cursors.WaitCursor;
           t.Start();
-          Response resp = scf.Login(tbUserName.Text, tbPwd.Text);
+          resp = scf.Login(tbUserName.Text, tbPwd.Text);
           t.Abort();
-          if (resp.StatusMessage == "Logged in") return true;
+          this.Cursor = Cursors.Default;
+          if (resp.Success == true) return true;
           lblError.Text = resp.StatusMessage;
+          MessageBox.Show("Wrong username or password");
         }
         catch (EndpointNotFoundException ene) {
+          t.Abort();
+          this.Cursor = Cursors.Default;
+          MessageBox.Show(ene.Message);
           lblError.Text = "No Service at this address!";
+          scf = null;
         }
-        catch (FaultException ex) {
+        catch (Exception ex) {
           //login failed
-          lblError.Text = "Logon failed!";
           t.Abort();
-          return false;
+          this.Cursor = Cursors.Default;
+          MessageBox.Show(ex.Message);
+          lblError.Text = "Logon failed! Please restart console";
         }
       }
-      //validation failed
-      t.Abort();
-      return false;
+        return false;
     }
+
 
     private void ShowWaitDlg() {
@@ -161 +169 @@
         this.Visible = true;
         ServiceLocator.ShutDownFacade();
+        lblError.Text = "";
         if (error == true) {
           lblError.Text = "Establishing server connection failed.";

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -216 +216 @@
       changes.Clear();
 
-      //#region ClientInfo
-      //ResponseList<ClientInfo> clientInfoOld = clientInfo;
-      //clientInfo = ClientManager.GetAllClients();
-
-      //IDictionary<int, ClientInfo> clientInfoOldHelp;
-
-      //CloneList(clientInfoOld, out clientInfoOldHelp);
-
-      //GetDelta(clientInfoOld.List, clientInfoOldHelp);
-      //#endregion
-
-      #region Clients
-      //ResponseList<ClientGroup> clientsOld = clients;
-
-      // newClients = ClientManager.GetAllClientGroups();
-
-      //IDictionary<Guid, ClientGroup> clientsOldHelp;
-
-      //CloneList(clientsOld, out clientsOldHelp);
-
-      //GetDelta(clientsOld.List, clientsOldHelp);
-      //DetermineDelta();
-      #endregion
-
       #region Job
       ResponseList<Job> jobsOld = jobs;
@@ -259 +235 @@
 
       #endregion
-
-      foreach (Changes change in changes) {
-        System.Diagnostics.Debug.WriteLine(change.ID + " " + change.ChangeType);
-      }
-
     }
 
@@ -290 +261 @@
         jobGroup.Add(lvJobPending);
 
-        foreach (Job job in jobs.List) {
-          if (job.State == State.calculating) {
-            ListViewItem lvi = new ListViewItem(job.Id.ToString(), 1, lvJobCalculating);
-            lvi.Tag = job;
-            jobObjects.Add(lvi);
-
-            lvi.ToolTipText = (job.Percentage * 100) + "% of job calculated";
-          } else if (job.State == State.finished) {
-            ListViewItem lvi = new ListViewItem(job.Id.ToString(), 0, lvJobFinished);
-            lvi.Tag = job;
-            jobObjects.Add(lvi);
-            //lvJobControl.Items.Add(lvi);
-          } else if (job.State == State.offline) {
-            ListViewItem lvi = new ListViewItem(job.Id.ToString(), 2, lvJobPending);
-            lvi.Tag = job;
-            jobObjects.Add(lvi);
-          }
-        } // Jobs
-        lvJobControl.BeginUpdate();
-        foreach (ListViewItem lvi in jobObjects) {
-          lvJobControl.Items.Add(lvi);
-        }
-        // actualization
-        lvJobControl.Groups.Add(lvJobCalculating);
-        lvJobControl.Groups.Add(lvJobFinished);
-        lvJobControl.Groups.Add(lvJobPending);
-        lvJobControl.EndUpdate();
-
-        if (currentJob != null) {
-          JobClicked();
+        if (jobs != null && jobs.List != null) {
+
+          foreach (Job job in jobs.List) {
+            if (job.State == State.calculating) {
+              ListViewItem lvi = new ListViewItem(job.Id.ToString(), 1, lvJobCalculating);
+              lvi.Tag = job;
+              jobObjects.Add(lvi);
+
+              lvi.ToolTipText = (job.Percentage * 100) + "% of job calculated";
+            } else if (job.State == State.finished) {
+              ListViewItem lvi = new ListViewItem(job.Id.ToString(), 0, lvJobFinished);
+              lvi.Tag = job;
+              jobObjects.Add(lvi);
+              //lvJobControl.Items.Add(lvi);
+            } else if (job.State == State.offline || job.State == State.pending) {
+              ListViewItem lvi = new ListViewItem(job.Id.ToString(), 2, lvJobPending);
+              lvi.Tag = job;
+              jobObjects.Add(lvi);
+            }
+          } // Jobs
+          lvJobControl.BeginUpdate();
+          foreach (ListViewItem lvi in jobObjects) {
+            lvJobControl.Items.Add(lvi);
+          }
+          // actualization
+          lvJobControl.Groups.Add(lvJobCalculating);
+          lvJobControl.Groups.Add(lvJobFinished);
+          lvJobControl.Groups.Add(lvJobPending);
+          lvJobControl.EndUpdate();
+
+          if (currentJob != null) {
+            JobClicked();
+          }
         }
       }
@@ -497 +471 @@
           ResponseObject<JobResult> jobRes = jobManager.GetLastJobResultOf(currentJob.Id);
 
-          lvi = null;
-          lvi = new ListViewItem();
-          lvi.Text = "Calculation ended:";
-          lvi.SubItems.Add(jobRes.Obj.DateFinished.ToString());
-          lvJobDetails.Items.Add(lvi);
+          if (jobRes != null && jobRes.Obj != null) {
+            lvi = null;
+            lvi = new ListViewItem();
+            lvi.Text = "Calculation ended:";
+            lvi.SubItems.Add(jobRes.Obj.DateFinished.ToString());
+            lvJobDetails.Items.Add(lvi);
+          }
         }
       }
@@ -554 +530 @@
               if (job.Id == change.ID) {
                 lvJobControl.Items[i].Tag = job;
-                if (currentJob.Id == change.ID) {
-                  currentJob = job;
-                  JobClicked();
+                if (currentJob != null) {
+                  if (currentJob.Id == change.ID) {
+                    currentJob = job;
+                    JobClicked();
+                  }
                 }
                 break;
@@ -562 +540 @@
             }
             State state = jobs.List[change.Position].State;
-            System.Diagnostics.Debug.WriteLine(lvJobControl.Items[i].Text.ToString());
             if (state == State.finished) {
               lvJobControl.Items[i].Group = jobGroup[1];
               lvJobControl.Items[i].ImageIndex = 0;
-              System.Diagnostics.Debug.WriteLine("finished");
             } else if (state == State.calculating) {
               lvJobControl.Items[i].Group = jobGroup[0];
               lvJobControl.Items[i].ImageIndex = 1;
-              System.Diagnostics.Debug.WriteLine("calculating");
-            } else if (state == State.offline) {
+            } else if (state == State.offline || state == State.pending) {
               lvJobControl.Items[i].Group = jobGroup[2];
               lvJobControl.Items[i].ImageIndex = 2;
-              System.Diagnostics.Debug.WriteLine("offline");
-
             }
             lvJobControl.Refresh();
@@ -813 +786 @@
       if (noCores > 0) {
         int capacity = ((noCores - freeCores) / noCores) * 100;
-        System.Diagnostics.Debug.WriteLine(capacity);
         return capacity;
       }
@@ -862 +834 @@
         if (found == false) {
           changes.Add(new Changes { Types = Type.Job, ID = job.Id, ChangeType = Change.Create });
-          System.Diagnostics.Debug.WriteLine("new Job: " + job.Id);
         }
         found = false;
@@ -868 +839 @@
       foreach (KeyValuePair<int, Job> kvp in helpJobs) {
         changes.Add(new Changes { Types = Type.Job, ID = kvp.Value.Id, ChangeType = Change.Delete, Position = kvp.Key });
-        System.Diagnostics.Debug.WriteLine("delete Job: " + kvp.Value.Id);
       }
     }

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/LogonDlg.Designer.cs

@@ -59 +59 @@
       this.Controls.Add(this.label1);
       this.Controls.Add(this.pictureBox1);
+      this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
       this.Name = "LogonDlg";