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

-remove unneeded -dev packages from install 

-remove timezone check from pypo-fetch
This commit is contained in:
martin 2011-08-17 15:50:28 -04:00
parent 0cb9947980
commit 57834097e8
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install_full/ubuntu/airtime-full-install
View File

@ -26,9 +26,9 @@ echo "----------------------------------------------------"
# Updated package list # Updated package list
sudo apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \ sudo apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \
php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \ php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \
libvorbis-ocaml-dev libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml \ libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 icecast2 sudo libportaudio2 libsamplerate0 libcamomile-ocaml-dev \ libesd0 icecast2 sudo libportaudio2 libsamplerate0 rabbitmq-server \
ecasound php5-curl mpg123 rabbitmq-server monit python-virtualenv php5-curl mpg123 monit python-virtualenv
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
echo "" echo ""

20
python_apps/pypo/pypofetch.py
View File

@ -166,20 +166,6 @@ class PypoFetch(Thread):
self.cache_dir = config["cache_dir"] + self.export_source + '/' self.cache_dir = config["cache_dir"] + self.export_source + '/'
logger.info("Creating cache directory at %s", self.cache_dir) logger.info("Creating cache directory at %s", self.cache_dir)
def check_matching_timezones(self, server_timezone):
logger = logging.getLogger('fetch')
process = Popen(["date", "+%z"], stdout=PIPE)
pypo_timezone = (process.communicate()[0]).strip(' \r\n\t')
if server_timezone != pypo_timezone:
logger.error("ERROR: Airtime server and pypo timezone offsets do not match. Audio playback will not start when expected!!!")
logger.error(" * Server timezone offset: %s", server_timezone)
logger.error(" * Pypo timezone offset: %s", pypo_timezone)
logger.error(" * To fix this, you need to set the 'date.timezone' value in your php.ini file and restart apache.")
logger.error(" * See this page for more info (v1.7): http://wiki.sourcefabric.org/x/BQBF")
logger.error(" * and also the 'FAQ and Support' page underneath it.")
""" """
def get_currently_scheduled(self, playlistsOrMedias, str_tnow_s): def get_currently_scheduled(self, playlistsOrMedias, str_tnow_s):
for key in playlistsOrMedias: for key in playlistsOrMedias:
@ -228,12 +214,6 @@ class PypoFetch(Thread):
logger = logging.getLogger('fetch') logger = logging.getLogger('fetch')
playlists = schedule_data["playlists"] playlists = schedule_data["playlists"]
#if bootstrapping:
#TODO: possible allow prepare_playlists to handle this.
#self.handle_shows_currently_scheduled(playlists)
self.check_matching_timezones(schedule_data["server_timezone"])
# Push stream metadata to liquidsoap # Push stream metadata to liquidsoap
# TODO: THIS LIQUIDSOAP STUFF NEEDS TO BE MOVED TO PYPO-PUSH!!! # TODO: THIS LIQUIDSOAP STUFF NEEDS TO BE MOVED TO PYPO-PUSH!!!
stream_metadata = schedule_data['stream_metadata'] stream_metadata = schedule_data['stream_metadata']