From 70931e9a5e3566d1fc337ae89f7e43c99d65fe12 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 15 Feb 2013 17:26:08 -0500 Subject: [PATCH 1/2] CC-4956: Merge nginx + apache install full scripts -install appropriate packages --- install_full/ubuntu/airtime-full-install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 6fffe3e1c..d574b9adb 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -53,7 +53,7 @@ fi apt-get update # Updated package list -apt-get -y --force-yes install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \ +apt-get -y --force-yes install tar gzip curl php5-pgsql \ php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \ libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ @@ -61,6 +61,7 @@ php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools \ pwgen libfaad2 + #install packages with --force-yes option (this is useful in the case #of Debian, where these packages are unauthorized) apt-get -y --force-yes install libmp3lame-dev lame icecast2 @@ -87,6 +88,7 @@ apt-get -y --force-yes install liquidsoap apt-get -y --force-yes install silan if [ "$server" = "nginx" ]; then + apt-get -y --force-yes install nginx php5-fpm # NGINX Config File echo "----------------------------------------------------" echo "2.1 NGINX Config File" @@ -110,6 +112,7 @@ if [ "$server" = "nginx" ]; then echo "Airtime php pool file already exists..." fi else + apt-get -y --force-yes install apache2 libapache2-mod-php5 # Apache Config File echo "----------------------------------------------------" echo "2. Apache Config File" From 8f53871ddcfb1fd3ac2744af74c1bfc722c8d09f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 20 Feb 2013 14:40:16 -0500 Subject: [PATCH 2/2] CC-4970: Process return codes aren't "reaped" after exiting - Zombie processes are created. -fixed --- python_apps/media-monitor2/media/metadata/process.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python_apps/media-monitor2/media/metadata/process.py b/python_apps/media-monitor2/media/metadata/process.py index ccaa1f41c..74d008b66 100644 --- a/python_apps/media-monitor2/media/metadata/process.py +++ b/python_apps/media-monitor2/media/metadata/process.py @@ -174,7 +174,8 @@ def normalize_mutagen(path): try: command = ['silan', '-f', 'JSON', md['path']] proc = subprocess.Popen(command, stdout=subprocess.PIPE) - out = proc.stdout.read() + out = proc.communicate()[0].strip('\r\n') + info = json.loads(out) md['cuein'] = info['sound'][0][0] md['cueout'] = info['sound'][-1][1]