Changeset 31

Timestamp:

May 19, 2008, 7:25:54 AM (16 years ago)

Author:

george

Message:

Upraveno: Přepracování a pročištění skriptů.

Location:

measure_scripts

Files:

• monitor_sample.php (modified) (1 diff)
• system.php (modified) (1 diff)
• wow.php (modified) (2 diffs)

measure_scripts/monitor_sample.php

@@ -18 +18 @@
   file_get_contents($Config['AddNewValueUrl'].'?MeasureId=8&Value='.WoWAccountCount());
   file_get_contents($Config['AddNewValueUrl'].'?MeasureId=10&Value='.WoWGMOnline());
-  file_get_contents($Config['AddNewValueUrl'].'?MeasureId=11&Value='.round($NetworkState['eth1']['down_avg']));
-  file_get_contents($Config['AddNewValueUrl'].'?MeasureId=12&Value='.round($NetworkState['eth1']['up_avg'])); 
+  file_get_contents($Config['AddNewValueUrl'].'?MeasureId=11&Value='.round($NetworkState['eth1']['DownAverage']));
+  file_get_contents($Config['AddNewValueUrl'].'?MeasureId=12&Value='.round($NetworkState['eth1']['UpAverage'])); 
   file_get_contents($Config['AddNewValueUrl'].'?MeasureId=13&Value='.WoWCharacterCount());
   file_get_contents($Config['AddNewValueUrl'].'?MeasureId=14&Value='.WoWGuildCount());

measure_scripts/system.php

@@ -73 +73 @@
   } else
   {
-    $cpuUSERcent=0;
-    $cpuSYSTcent=0;
-    $cpuIDLEcent=0;
+    $cpuUSERcent  =0;
+    $cpuSYSTcent = 0;
+    $cpuIDLEcent = 0;
   }
-  $cpuUSERprev=$cpuUSER;
-  $cpuSYSTprev=$cpuSYST;
-  $cpuIDLEprev=$cpuIDLE;
-  return(100-round($cpuIDLEcent*100)/100);
+  $cpuUSERprev = $cpuUSER;
+  $cpuSYSTprev = $cpuSYST;
+  $cpuIDLEprev = $cpuIDLE;
+  return(100 - round($cpuIDLEcent * 100) / 100);
 }
 
 function GetNetworkState()
 {  
-  // Get last values
-  $File = fopen('/tmp/traffic', 'r');
-  $LastResult = unserialize(fgets($File));
-  fclose($File);
+  global $LastNetworkState;
   
-  $Result = array('time' => time());
+  if(!isset($LastNetworkState)) $LastNetworkState = array();
+  $NetworkState = array('Time' => time());
   $Output = array();
   exec('cat /proc/net/dev', $Output);
-  array_shift($Output);
-  array_shift($Output);
+  array_shift($Output); // Skip header
+  array_shift($Output); // Skip header
   foreach($Output as $Item)
   { 
-//    echo($Item."\n");
-    while(strpos($Item, '  ') !== false) $Item = str_replace('  ', ' ', $Item);
+    while(strpos($Item, '  ') !== false) $Item = str_replace('  ', ' ', $Item);  // Rrmove multiple spaces
     $Item = explode(':', $Item);
     $Interface = trim($Item[0]);
     $Item = explode(' ', trim($Item[1]));
-    $Period = time() - $LastResult['time'];
-    $Result[$Interface] = array('down' => $Item[0], 'up' => $Item[8]);
-    $Result[$Interface]['down_avg'] = round(($Result[$Interface]['down'] - $LastResult[$Interface]['down']) / $Period);
-    $Result[$Interface]['up_avg'] = round(($Result[$Interface]['up'] - $LastResult[$Interface]['up']) / $Period);
-    if($Result[$Interface]['down_avg'] < 0) $Result[$Interface]['down_avg'] = 0;
-    if($Result[$Interface]['up_avg'] < 0) $Result[$Interface]['up_avg'] = 0;
+    $NetworkState[$Interface] = array('Down' => $Item[0], 'Up' => $Item[8]);
+    if(array_key_exists($Interface, $LastNetworkState))
+    {
+      $Period = time() - $LastNetworkState['Time'];
+      $NetworkState[$Interface]['DownAverage'] = round(($NetworkState[$Interface]['Down'] - $LastNetworkState[$Interface]['Down']) / $Period);
+      $NetworkState[$Interface]['UpAverage'] = round(($NetworkState[$Interface]['Up'] - $LastNetworkState[$Interface]['Up']) / $Period);
+    } else
+    {
+      $NetworkState[$Interface]['DownAverage'] = 0;
+      $NetworkState[$Interface]['UpAverage'] = 0;
+    }
+    if($NetworkState[$Interface]['DownAverage'] < 0) $NetworkState[$Interface]['DownAverage'] = 0;
+    if($NetworkState[$Interface]['UpAverage'] < 0) $NetworkState[$Interface]['UpAverage'] = 0;
   }
-  // Save last values
-  $File = fopen('/tmp/traffic', 'w+');
-  fputs($File, serialize($Result));
-  fclose($File);
-//  print_r($Result);
-  return($Result);
+  $LastNetworkState = $NetworkState;
+  return($NetworkState);
 }
 
-function TeamSpeak()
+function NetworkServiceConnectionCount($Port)
 {
+  $HostIP = gethostbyname(trim(`hostname`));
   $Output = array();
-  exec('cat /proc/net/nf_conntrack|grep "dst=192.168.0.14 "|grep "dport=8767 "|grep "ASSURED"', $Output);
+  exec('cat /proc/net/nf_conntrack|grep "dst='.$HostIP.' "|grep "dport='.$Port.' "|grep "ASSURED"', $Output);
   return(count($Output));
 }

measure_scripts/wow.php

@@ -51 +51 @@
 
   $Database->select_db('characters');
-  $DbResult = $Database->query('SELECT COUNT(*) FROM `character`');
+  $DbResult = $Database->query('SELECT COUNT(*) FROM `characters`');
   $Row = $DbResult->fetch_array();
   return($Row[0]);
@@ -60 +60 @@
   global $Database;
 
-  $Database->select_db('wow');
-  $DbResult = $Database->query('SELECT COUNT(*) FROM mangos_restart');
+  $Database->select_db('mangos');
+  $DbResult = $Database->query('SELECT COUNT(*) FROM uptime');
   $Row = $DbResult->fetch_array();
   return($Row[0]);