Changeset 462 for trunk

Timestamp:

Jun 5, 2006 9:21:06 PM (18 years ago)

Author:

mmc

Message:

Fixed nanovis to take a series of server names as a comma-separated
list, and to try them one after another to make a connection. That
way, if one server is down, you can still reach the rest of the farm.

Added a customized bug handler that looks a little less frightening
than the standard Tcl dialog. Someday, this should log all errors
to a web service, but for now, it just encourages the user to do so.

Location:

trunk/gui

Files:

• apps/driver (modified) (1 diff)
• scripts/bugreport.tcl (added)
• scripts/field3dresult.tcl (modified) (2 diffs)
• scripts/images/alert.gif (added)
• scripts/nanovisviewer.tcl (modified) (8 diffs)

trunk/gui/apps/driver

@@ -29 +29 @@
 package require Rappture
 package require RapptureGUI
+
+# install a better bug handler
+Rappture::bugreport::install
 
 option add *MainWin.mode desktop startupFile

trunk/gui/scripts/field3dresult.tcl

@@ -40 +40 @@
 
     # resources file tells us the nanovis server
-    public common _nanovisHost ""
-    public common _nanovisPort ""
-    public proc setNanovisServer {name} {
-        if {[regexp {^([a-zA-Z0-9\.]+):([0-9]+)$} $name match host port]} {
-            set _nanovisHost $host
-            set _nanovisPort $port
+    public common _nanovisHosts ""
+    public proc setNanovisServer {namelist} {
+        if {[regexp {^[a-zA-Z0-9\.]+:[0-9]+(,[a-zA-Z0-9\.]+:[0-9]+)*$} $namelist match]} {
+            set _nanovisHosts $namelist
         } else {
-            error "bad nanovis server address \"$name\": should be host:port"
+            error "bad nanovis server address \"$namelist\": should be host:port,host:port,..."
         }
     }
@@ -72 +70 @@
     array set flags $args
 
-    if {"" != $_nanovisHost && "" != $_nanovisPort && $flags(-mode) != "vtk"} {
+    if {"" != $_nanovisHosts && $flags(-mode) != "vtk"} {
         itk_component add renderer {
-            Rappture::NanovisViewer $itk_interior.ren \
-                $_nanovisHost $_nanovisPort
+            Rappture::NanovisViewer $itk_interior.ren $_nanovisHosts
         }
         pack $itk_component(renderer) -expand yes -fill both

trunk/gui/scripts/nanovisviewer.tcl

@@ -34 +34 @@
     itk_option define -plotoutline plotOutline PlotOutline ""
 
-    constructor {host port args} { # defined below }
+    constructor {hostlist args} { # defined below }
     destructor { # defined below }
 
@@ -43 +43 @@
     public method download {option}
 
-    public method connect {{host ""} {port ""}}
+    public method connect {{hostlist ""}}
     public method disconnect {}
     public method isconnected {}
@@ -71 +71 @@
     private variable _dispatcher "" ;# dispatcher for !events
 
-    private variable _nvhost ""    ;# host name for nanovis server
-    private variable _nvport ""    ;# port number for nanovis server
+    private variable _nvhosts ""   ;# list of hosts for nanovis server
     private variable _sid ""       ;# socket connection to nanovis server
     private variable _parser ""    ;# interpreter for incoming commands
@@ -98 +97 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::NanovisViewer::constructor {nvhost nvport args} {
+itcl::body Rappture::NanovisViewer::constructor {hostlist args} {
     Rappture::dispatcher _dispatcher
     $_dispatcher register !legend
@@ -412 +411 @@
     eval itk_initialize $args
 
-    connect $nvhost $nvport
+    connect $hostlist
 }
 
@@ -590 +589 @@
 
 # ----------------------------------------------------------------------
-# USAGE: connect ?<host>? ?<port>?
+# USAGE: connect ?<host:port>,<host:port>...?
 #
 # Clients use this method to establish a connection to a new
@@ -596 +595 @@
 # Any existing connection is automatically closed.
 # ----------------------------------------------------------------------
-itcl::body Rappture::NanovisViewer::connect {{host ""} {port ""}} {
+itcl::body Rappture::NanovisViewer::connect {{hostlist ""}} {
     disconnect
 
-    if {"" != $host} { set _nvhost $host }
-    if {"" != $port} { set _nvport $port }
-
-    if {"" == $_nvhost || "" == $_nvport} {
+    if {"" != $hostlist} { set _nvhosts $hostlist }
+
+    if {"" == $_nvhosts} {
         return 0
     }
@@ -616 +614 @@
     # forward us to another.
     #
+    set try [split $_nvhosts ,]
+    foreach {hostname port} [split [lindex $try 0] :] break
+    set try [lrange $try 1 end]
+
     while {1} {
-        if {[catch {socket $_nvhost $_nvport} sid]} {
-            return 0
+        if {[catch {socket $hostname $port} sid]} {
+            if {[llength $try] == 0} {
+                return 0
+            }
+            foreach {hostname port} [split [lindex $try 0] :] break
+            set try [lrange $try 1 end]
+            continue
         }
         fconfigure $sid -translation binary -encoding binary