diff --git a/install/apache/airtime-vhost b/install/apache/airtime-vhost index 1af67e56b..4caf438db 100644 --- a/install/apache/airtime-vhost +++ b/install/apache/airtime-vhost @@ -1,6 +1,5 @@ ServerAdmin foo@bar.org - ServerName inferno.web.id DocumentRoot /var/www/airtime/public diff --git a/python_apps/media-monitor/airtime-media-monitor-start b/python_apps/media-monitor/airtime-media-monitor-start index 084b2b1ad..2b50bb0f4 100755 --- a/python_apps/media-monitor/airtime-media-monitor-start +++ b/python_apps/media-monitor/airtime-media-monitor-start @@ -11,6 +11,7 @@ if os.geteuid() != 0: try: print "Starting daemontool script recorder" os.system("svc -u /etc/service/recorder") + os.system("svc -u /etc/service/recorder/log") except Exception, e: print "exception:" + str(e) diff --git a/python_apps/pypo/airtime-pypo-start b/python_apps/pypo/airtime-pypo-start index 9d5811638..68e323c6c 100755 --- a/python_apps/pypo/airtime-pypo-start +++ b/python_apps/pypo/airtime-pypo-start @@ -11,9 +11,11 @@ if os.geteuid() != 0: try: print "Starting daemontool script pypo" os.system("svc -u /etc/service/pypo") + os.system("svc -u /etc/service/pypo/log") print "Starting daemontool script pypo-liquidsoap" os.system("svc -u /etc/service/pypo-liquidsoap") - + os.system("svc -u /etc/service/pypo-liquidsoap/log") + except Exception, e: print "exception:" + str(e) diff --git a/python_apps/show-recorder/airtime-show-recorder-start b/python_apps/show-recorder/airtime-show-recorder-start index 084b2b1ad..2b50bb0f4 100755 --- a/python_apps/show-recorder/airtime-show-recorder-start +++ b/python_apps/show-recorder/airtime-show-recorder-start @@ -11,6 +11,7 @@ if os.geteuid() != 0: try: print "Starting daemontool script recorder" os.system("svc -u /etc/service/recorder") + os.system("svc -u /etc/service/recorder/log") except Exception, e: print "exception:" + str(e) diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php index fbd705514..1f7823214 100644 --- a/utils/airtime-check-system.php +++ b/utils/airtime-check-system.php @@ -9,6 +9,8 @@ require_once "$airtime_base_dir/library/php-amqplib/amqp.inc"; set_error_handler("myErrorHandler"); +AirtimeCheck::GetCpuInfo(); +AirtimeCheck::GetRamInfo(); AirtimeCheck::CheckOsTypeVersion(); AirtimeCheck::CheckConfigFilesExist(); @@ -170,6 +172,32 @@ class AirtimeCheck { output_status("ICECAST_PROCESS_ID", $status); } + public static function GetCpuInfo() + { + $command = "cat /proc/cpuinfo |grep -m 1 'model name' "; + exec($command, $output, $result); + + $choppedStr = split(":", $output[0]); + $status = trim($choppedStr[1]); + output_status("CPU", $status); + } + + public static function GetRamInfo() + { + $command = "cat /proc/meminfo |grep 'MemTotal' "; + exec($command, $output, $result); + $choppedStr = split(":", $output[0]); + $status = trim($choppedStr[1]); + output_status("Total RAM", $status); + + $output = null; + $command = "cat /proc/meminfo |grep 'MemFree' "; + exec($command, $output, $result); + $choppedStr = split(":", $output[0]); + $status = trim($choppedStr[1]); + output_status("Free RAM", $status); + } + public static function CheckConfigFilesExist() { //echo PHP_EOL."Verifying Config Files in /etc/airtime".PHP_EOL; @@ -394,6 +422,12 @@ class AirtimeCheck { $os_string = "Unknown"; } + // Figure out if 32 or 64 bit + $command = "file -b /sbin/init"; + exec($command, $output, $result); + $splitStr = split(",", $output[0]); + $os_string .= $splitStr[1]; + output_status("OS", $os_string); } }