Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SAAS-94: Phone home metrics: Gather info about streaming setup

Browse source 
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
This commit is contained in:
James 2011-12-07 10:31:16 -05:00
parent 417c4ba022
commit fd10393b01
3 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/models/Preference.php
View file

@ -368,6 +368,7 @@ class Application_Model_Preference
$outputArray['STATION_COUNTRY'] = self::GetStationCountry(); $outputArray['STATION_COUNTRY'] = self::GetStationCountry();
$outputArray['STATION_CITY'] = self::GetStationCity(); $outputArray['STATION_CITY'] = self::GetStationCity();
$outputArray['STATION_DESCRIPTION'] = self::GetStationDescription(); $outputArray['STATION_DESCRIPTION'] = self::GetStationDescription();
// get web server info // get web server info
if(isset($systemInfoArray["AIRTIME_VERSION_URL"])){ if(isset($systemInfoArray["AIRTIME_VERSION_URL"])){
@ -387,6 +388,8 @@ class Application_Model_Preference
$outputArray['UNIQUE_ID'] = self::GetUniqueId(); $outputArray['UNIQUE_ID'] = self::GetUniqueId();
$outputArray['SAAS'] = self::GetPlanLevel(); $outputArray['SAAS'] = self::GetPlanLevel();
$outputArray['INSTALL_METHOD'] = self::GetInstallMethod(); $outputArray['INSTALL_METHOD'] = self::GetInstallMethod();
$outputArray['NUM_OF_STREAMS'] = self::GetNumOfStreams();
$outputArray['STREAM_INFO'] = Application_Model_StreamSetting::getStreamInfoForDataCollection();
$outputArray = array_merge($systemInfoArray, $outputArray); $outputArray = array_merge($systemInfoArray, $outputArray);
@ -396,7 +399,16 @@ class Application_Model_Preference
continue; continue;
} }
if($out != ''){ if($out != ''){
$outputString .= $key.' : '.$out."\n"; if($key == "STREAM_INFO"){
$outputString .= $key." :\n";
foreach($out as $s_info){
foreach($s_info as $k => $v){
$outputString .= "\t".strtoupper($k)." : ".$v."\n";
}
}
}else{
$outputString .= $key.' : '.$out."\n";
}
} }
} }
if($returnArray){ if($returnArray){

27
airtime_mvc/application/models/StreamSetting.php
View file

@ -164,4 +164,31 @@ class Application_Model_StreamSetting {
} }
return $result; return $result;
} }
/*
* Only returns info that is needed for data collection
* returns array('s1'=>array(keyname=>value))
*/
public static function getStreamInfoForDataCollection(){
global $CC_DBC;
$out = array();
$enabled_stream = self::getEnabledStreamIds();
foreach($enabled_stream as $stream){
$keys = "'".$stream."_output', "."'".$stream."_type', "."'".$stream."_bitrate', "."'".$stream."_host'";
$sql = "SELECT keyname, value FROM cc_stream_setting"
." WHERE keyname IN ($keys)";
$rows = $CC_DBC->getAll($sql);
$info = array();
foreach($rows as $r){
$temp = explode("_", $r['keyname']);
$info[$temp[1]] = $r['value'];
$out[$stream] = $info;
}
}
return $out;
}
} }

1
utils/phone_home_stat.php
View file

@ -36,6 +36,7 @@ require_once($CC_CONFIG['phpDir'].'/application/models/Schedule.php');
require_once($CC_CONFIG['phpDir'].'/application/models/Show.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Show.php');
require_once($CC_CONFIG['phpDir'].'/application/models/ShowInstance.php'); require_once($CC_CONFIG['phpDir'].'/application/models/ShowInstance.php');
require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php');
require_once($CC_CONFIG['phpDir'].'/application/models/StreamSetting.php');
//Pear classes. //Pear classes.
set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path()); set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());