Changeset 747 for branches/0.4/web/addons/job_monarch

Timestamp:

03/25/13 17:50:13 (10 years ago)

Author:

ramonb

Message:

• replaced some string operations with strpos

File:

• branches/0.4/web/addons/job_monarch/libtoga.php (modified) (7 diffs)

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

@@ -664 +664 @@
             foreach( $nodes as $hostname => $nimage )
             {
-                if( substr( $hostname, $domain_len ) != $tdomain )
+                if( strpos( $hostname, $tomdain ) !== false )
                 {
                     $fqdn    = 0;
@@ -677 +677 @@
         if( $tdomain && $fqdn )
         {
-            if( substr( $thostname, $domain_len ) != $tdomain )
+            if( strpos( $thostname, $tdomain ) !== false )
             {
                 $thostname = $thostname . '.'.$tdomain;
@@ -724 +724 @@
             }
         }
-        else if( $name == 'METRIC' and strstr( $attrs['NAME'], 'zplugin_monarch' ) and $this->proc_cluster == $this->clustername )
-        {
-            if( strstr( $attrs['NAME'], 'zplugin_monarch_heartbeat' ) )
+        else if( $name == 'METRIC' and ( strpos( $attrs['NAME'], 'zplugin_monarch' ) !== false ) and $this->proc_cluster == $this->clustername )
+        {
+            if( strpos( $attrs['NAME'], 'zplugin_monarch_heartbeat' ) !== false )
             {
                 $this->heartbeat['time'] = $attrs['VAL'];
             }
-            else if( strstr( $attrs['NAME'], 'zplugin_monarch_down' ) )
+            else if( strpos( $attrs['NAME'], 'zplugin_monarch_down' ) !== false )
             {
                 $fields        = explode( ' ', $attrs['VAL'] );
@@ -766 +766 @@
                 }
             }
-            else if( strstr( $attrs['NAME'], 'zplugin_monarch_offline' ) )
+            else if( strpos( $attrs['NAME'], 'zplugin_monarch_offline' ) !== false )
             {
                 $fields        = explode( ' ', $attrs['VAL'] );
@@ -802 +802 @@
                 }
             }
-            else if( strstr( $attrs['NAME'], 'zplugin_monarch_job' ) )
+            else if( strpos( $attrs['NAME'], 'zplugin_monarch_job' ) !== false )
             {
                 sscanf( $attrs['NAME'], 'zplugin_monarch_job_%d_%s$', $monincr, $jobid );
@@ -868 +868 @@
                             // Let's see if Ganglia use's FQDN or short hostnames
                             //
-                            if( substr( $first_host, $domain_len ) != $domain )
+                            if( strpos( $first_host, $domain ) === false )
                             {
                                 $this->fqdn    = 0;
@@ -885 +885 @@
                             if( $this->fqdn && isset( $jobs[$jobid]['domain'] ) )
                             {
-                                if( substr( $node, $domain_len ) != $domain )
+                                if( strpos( $node, $domain ) === false )
                                 {
                                     $host = $node. '.'.$domain;