diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 852ac60bd..a728e8846 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -810,12 +810,9 @@ class Application_Model_StoredFile { $contentType = $_SERVER["CONTENT_TYPE"]; // create temp file name (CC-3086) - $command = "mktemp --tmpdir=".$p_targetDir; - $tempFilePath= exec($command); - - if($tempFilePath == ""){ - die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Unable to create tmp file."}, "id" : "id"}'); - } + // we are not using mktemp command anymore. + // plupload support unique_name feature. + $tempFilePath= $p_targetDir . DIRECTORY_SEPARATOR . $fileName; if (strpos($contentType, "multipart") !== false) { if (isset($_FILES['file']['tmp_name']) && is_uploaded_file($_FILES['file']['tmp_name'])) { diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index 326fe8f8c..3a9bc616f 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -6,6 +6,7 @@ $(document).ready(function() { runtimes : 'gears, html5, html4', url : '/Plupload/upload/format/json', chunk_size: '5mb', + unique_names: 'true', multiple_queues : 'true', filters : [ {title: "Audio Files", extensions: "ogg,mp3"} @@ -52,7 +53,6 @@ $(document).ready(function() { uploadProgress = false; }); - $(window).bind('beforeunload', function(){ if(uploadProgress){ if(!confirm("You are currently uploading files.\nGoing to another screen will cancel the upload process.\nAre you sure you want to cancel the upload process and go to the screen you clicked on?")){ diff --git a/install_full/php5-fpm/airtime.conf b/install_full/php5-fpm/airtime.conf new file mode 100644 index 000000000..ea396422f --- /dev/null +++ b/install_full/php5-fpm/airtime.conf @@ -0,0 +1,251 @@ +# NGINX changes are contributed by Eugene MechanisM +# Link to the post: +# http://forum.sourcefabric.org/discussion/13563/first-step-to-run-airtime-via-nginx-based-on-airtime-2.0-beta-files + +; Start a new pool named 'airtime'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('airtime' here) +[airtime] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = '/var/run/airtime.php.sock' + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = -1 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = www-data +;listen.group = www-data +;listen.mode = 0666 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = www-data +group = www-data + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 10 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic') +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; max children reached: 1 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +chdir = / + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M + +php_admin_value[error_log] = /var/log/airtime.php-fpm.error.log +php_admin_value[post_max_size] = 500M +php_admin_value[upload_max_filesize] = 500M +php_admin_value[request_order] = GPC +php_admin_value[session.gc_probability] = 0 +php_admin_value[phar.readonly] = off +php_admin_value[upload_tmp_dir] = /tmp diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 30deb8a7e..9bc07919c 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \ libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ -libvorbis-ocaml libpulse0 +libvorbis-ocaml libpulse0 vorbis-tools #install packages with --force-yes option (this is useful in the case #of Debian, where these packages are unauthorized) @@ -61,7 +61,7 @@ echo "----------------------------------------------------" echo "2. Apache Config File" echo "----------------------------------------------------" if [ ! -f /etc/apache2/sites-available/airtime ]; then - cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime + cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime rm -rf /etc/apache2/sites-enabled/000-default ln -s /etc/apache2/sites-available/airtime /etc/apache2/sites-enabled/airtime a2enmod rewrite php5 @@ -90,7 +90,7 @@ grep -q "include /etc/monit/conf.d" /etc/monit/monitrc RETVAL=$? if [ $RETVAL -ne 0 ] ; then mkdir -p /etc/monit/conf.d - echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc + echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc fi # Run Airtime Install diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx new file mode 100755 index 000000000..efde36b32 --- /dev/null +++ b/install_full/ubuntu/airtime-full-install-nginx @@ -0,0 +1,115 @@ +#!/bin/bash +# +# Auto install script for airtime on Ubuntu +# +# NGINX changes are contributed by Eugene MechanisM +# Link to the post: +# http://forum.sourcefabric.org/discussion/13563/first-step-to-run-airtime-via-nginx-based-on-airtime-2.0-beta-files + +exec > >(tee install_log.txt) +exec 2>&1 + +if [ "$(id -u)" != "0" ]; then + echo "Please run as root user." + exit 1 +fi + +#Current dir +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=`readlink -f $0` +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=`dirname $SCRIPT` + +#Prerequisite +echo "----------------------------------------------------" +echo " 1. Install Packages" +echo "----------------------------------------------------" + +dist=`lsb_release -is` + +if [ "$dist" -eq "Debian" ]; then + grep "deb http://www.debian-multimedia.org squeeze main non-free" /etc/apt/sources.list + if [ "$?" -ne "0" ]; then + echo "deb http://www.debian-multimedia.org squeeze main non-free" >> /etc/apt/sources.list + fi +fi + +apt-get update + +# Updated package list +apt-get -y install tar gzip curl nginx php5-pgsql php5-fpm \ +php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \ +libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ +libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ +php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ +libvorbis-ocaml libpulse0 vorbis-tools + +#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 + +if [ "$?" -ne "0" ]; then + echo "" + echo "There was a problem with apt-get. Please check the above error and try again." + echo "" + exit 1 +fi + +# Install phing +pear channel-discover pear.phing.info +pear install phing/phing-2.4.2 + +# NGINX Config File +echo "----------------------------------------------------" +echo "2.1 NGINX Config File" +echo "----------------------------------------------------" +if [ ! -f /etc/nginx/sites-available/airtime ]; then + cp $SCRIPTPATH/../nginx/airtime-vhost /etc/nginx/sites-available/airtime + ln -s /etc/nginx/sites-available/airtime /etc/nginx/sites-enabled/airtime + service nginx reload +else + echo "NGINX config for Airtime already exists..." +fi + +# php-fpm Airtime pool file +echo "----------------------------------------------------" +echo "2.2 Airtime php pool file" +echo "----------------------------------------------------" +if [ ! -f /etc/php5/fpm/pool.d/airtime.conf ]; then + cp $SCRIPTPATH/../php5-fpm/airtime.conf /etc/php5/fpm/pool.d/airtime.conf + service php5-fpm reload +else + echo "Airtime php pool file already exists..." +fi + +# Enable Icecast +echo "----------------------------------------------------" +echo "3. Enable Icecast" +echo "----------------------------------------------------" +cd /etc/default/ +sed -i 's/ENABLE=false/ENABLE=true/g' icecast2 +service icecast2 start +echo "" + +# Enable Monit +echo "----------------------------------------------------" +echo "4. Enable Monit" +echo "----------------------------------------------------" +cd /etc/default/ +sed -i 's/startup=0/startup=1/g' monit + +grep -q "include /etc/monit/conf.d" /etc/monit/monitrc +RETVAL=$? +if [ $RETVAL -ne 0 ] ; then + mkdir -p /etc/monit/conf.d + echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc +fi + +# Run Airtime Install +echo "----------------------------------------------------" +echo "5. Run Airtime Install" +echo "----------------------------------------------------" +cd $SCRIPTPATH/../../install_minimal +./airtime-install + + diff --git a/python_apps/show-recorder/recorder.cfg b/python_apps/show-recorder/recorder.cfg index d6005bf0a..c010a8645 100644 --- a/python_apps/show-recorder/recorder.cfg +++ b/python_apps/show-recorder/recorder.cfg @@ -25,3 +25,6 @@ record_samplerate = 44100 record_channels = 2 record_sample_size = 16 +#can be either ogg|mp3, mp3 recording requires installation of the package "lame" +record_file_type = 'ogg' + diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py index 7cf7e0ab9..da94e212c 100644 --- a/python_apps/show-recorder/recorder.py +++ b/python_apps/show-recorder/recorder.py @@ -47,7 +47,7 @@ def getDateTimeObj(time): timeinfo = time.split(" ") date = timeinfo[0].split("-") time = timeinfo[1].split(":") - + date = map(int, date) time = map(int, time) @@ -55,12 +55,11 @@ def getDateTimeObj(time): class ShowRecorder(Thread): - def __init__ (self, show_instance, show_name, filelength, start_time, filetype): + def __init__ (self, show_instance, show_name, filelength, start_time): Thread.__init__(self) self.api_client = api_client.api_client_factory(config) self.filelength = filelength self.start_time = start_time - self.filetype = filetype self.show_instance = show_instance self.show_name = show_name self.logger = logging.getLogger('root') @@ -70,7 +69,13 @@ class ShowRecorder(Thread): length = str(self.filelength)+".0" filename = self.start_time filename = filename.replace(" ", "-") - filepath = "%s%s.%s" % (config["base_recorded_files"], filename, self.filetype) + + if config["record_file_type"] in ["mp3", "ogg"]: + filetype = config["record_file_type"] + else: + filetype = "ogg"; + + filepath = "%s%s.%s" % (config["base_recorded_files"], filename, filetype) br = config["record_bitrate"] sr = config["record_samplerate"] @@ -218,7 +223,7 @@ class CommandListener(): show_starts = getDateTimeObj(show[u'starts']) show_end = getDateTimeObj(show[u'ends']) time_delta = show_end - show_starts - + self.shows_to_record[show[u'starts']] = [time_delta, show[u'instance_id'], show[u'name']] delta = self.get_time_till_next_show() # awake at least 5 seconds prior to the show start @@ -256,14 +261,14 @@ class CommandListener(): show_length = self.shows_to_record[start_time][0] show_instance = self.shows_to_record[start_time][1] show_name = self.shows_to_record[start_time][2] - + T = pytz.timezone(self.server_timezone) start_time_on_UTC = getDateTimeObj(start_time) start_time_on_server = start_time_on_UTC.replace(tzinfo=pytz.utc).astimezone(T) start_time_formatted = '%(year)d-%(month)02d-%(day)02d %(hour)02d:%(min)02d:%(sec)02d' % \ {'year': start_time_on_server.year, 'month': start_time_on_server.month, 'day': start_time_on_server.day,\ 'hour': start_time_on_server.hour, 'min': start_time_on_server.minute, 'sec': start_time_on_server.second} - self.sr = ShowRecorder(show_instance, show_name, show_length.seconds, start_time_formatted, filetype="mp3") + self.sr = ShowRecorder(show_instance, show_name, show_length.seconds, start_time_formatted) self.sr.start() #remove show from shows to record.