Changeset 492 for trunk

Timestamp:

02/27/08 09:45:45 (16 years ago)

Author:

bastiaans

Message:

libtoga.php:

• rearranged domain code a little for situations without domain name

File:

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

trunk/web/addons/job_monarch/libtoga.php

@@ -693 +693 @@
                                         $nr_nodes = count( $jobs[$jobid][nodes] );
                 
-                                        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
-                                                //
-                                                foreach( $nodes as $hostname => $nimage ) {
+                                        if( $jobs[$jobid][status] == 'R' )
+                                        {
+
+                                                if( isset( $jobs[$jobid][domain] )
+                                                {
+                                                        $domain         = $jobs[$jobid][domain];
+                                                        $domain_len     = 0 - strlen( $domain );
+
+                                                        // Let's see if Ganglia use's FQDN or short hostnames
+                                                        //
+                                                        foreach( $nodes as $hostname => $nimage )
+                                                        {
                                         
-                                                        if( substr( $hostname, $domain_len ) != $domain )
-                                                        {
-                                                                $this->fqdn     = 0;
+                                                                if( substr( $hostname, $domain_len ) != $domain )
+                                                                {
+                                                                        $this->fqdn     = 0;
+                                                                }
                                                         }
                                                 }
@@ -712 +717 @@
                                                         // Only add domain name to the hostname if Ganglia is doing that too
                                                         //
-                                                        if( $this->fqdn )
+                                                        if( ( $this->fqdn ) && ( isset( $jobs[$jobid][domain] ) )
                                                         {
-                                                                if( substr( $node, $domain_len ) != $domain ) {
+                                                                if( substr( $node, $domain_len ) != $domain )
+                                                                {
                                                                         $host = $node. '.'.$domain;
-                                                                } else {
+                                                                } else
+                                                                {
                                                                         $host = $node;
                                                                 }