Changeset 461 for trunk/web/addons/job_monarch/libtoga.php

Timestamp:

02/06/08 11:45:48 (16 years ago)

Author:

bastiaans

Message:

libtoga.php:

• fix to ganglia domain name detection

File:

• trunk/web/addons/job_monarch/libtoga.php (modified) (3 diffs)

trunk/web/addons/job_monarch/libtoga.php

@@ -733 +733 @@
                                         if( $jobs[$jobid][status] == 'R' ) {
 
+                                                $domain         = $jobs[$jobid][domain];
+                                                $domain_len     = 0 - strlen( $domain );
+
                                                 // Let's see if Ganglia use's FQDN or short hostnames
                                                 //
@@ -745 +748 @@
                                                 foreach( $jobs[$jobid][nodes] as $node ) {
 
-                                                        $domain = $jobs[$jobid][domain];
-                                                        $domain_len = 0 - strlen( $domain );
-
+                                                        // Only add domain name to the hostname if Ganglia is doing that too
+                                                        //
                                                         if( $this->fqdn )
                                                         {
@@ -761 +763 @@
                                                         }
 
-                                                        //$host = $node.'.'.$jobs[$jobid][domain];
-                                
                                                         if( !isset( $nodes[$host] ) )
                                                                 $my_node = new NodeImage( $this->proc_cluster, $host );