Changeset 865

Timestamp:

05/15/13 22:12:44 (10 years ago)

Author:

ramonb

Message:

libtoga.php:

• xml parsing finishUp() used different hostname logic
• fixed: down/offline nodes properly marked in cluster image again
• closes #165

File:

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

branches/1.0/web/addons/job_monarch/libtoga.php

@@ -707 +707 @@
     function makeHostname( $thostname, $tdomain=null )
     {
-        // Should hostname be FQDN or short w/o domain
-        //
-        $nodes = &$this->nodes;
-
-        $fqdn = 1;
-
-        //$tdomain = explode( '.', $thostname );
-        //
-        // TODO?: extract domain from hostname or something?
-
-        if( $tdomain )
-        {
-            $domain_len    = 0 - strlen( $tdomain );
-
-            // Let's see if Ganglia use's FQDN or short hostnames
-            //
-            foreach( $nodes as $hostname => $nimage )
-            {
-                if( strpos( $hostname, $tomdain ) !== false )
-                {
-                    $fqdn    = 0;
-                }
-            }
-        }
-        else
-        {
-            $fqdn    = 0;
-        }
-    
-        if( $tdomain && $fqdn )
-        {
-            if( strpos( $thostname, $tdomain ) !== false )
-            {
-                $thostname = $thostname . '.'.$tdomain;
+        if( $this->fqdn && isset( $tdomain ) )
+        {
+            if( strpos( $thostname, $tdomain ) === false )
+            {
+                $mhost = $thostname . '.' . $tdomain;
             } 
             else
             {
-                $thostname = $thostname;
-            }
-        }
-
-        return $thostname;
+                $mhost = $thostname;
+            }
+        }
+        else
+        {
+            $mhost = $thostname;
+        }
+
+        return $mhost;
     }
 
@@ -990 +965 @@
                                 {
                                     $host = $node. '.'.$domain;
-                                } else
+                                } 
+                                else
                                 {
                                     $host = $node;