Robb Ebright
314654dfe4
Enable logging for analyzer and pypo
2017-08-05 17:56:23 -04:00
Lucas Bickel
0a556adbfa
Use proper protocol in URL if port is set to 443
...
This adds TLS support to pypo when downloading files from the REST
API. I previously fixed some similar issues in the api_client and
wasn't aware that pypo isn't using it for every URL..
2017-07-21 12:27:34 +02:00
Lucas Bickel
65a4961aac
Merge pull request #187 from Kirill-Kad/patch-1
...
Correction lines 399 and 400. ls_script.liq
2017-04-25 13:09:58 +02:00
Robb
ebd7c1d2a3
Merge pull request #163 from radiorabe/feature/python-debug-flag-for-140
...
Problem: airtime-liquidsoap --debug only works for liquidsoap
2017-04-17 16:36:07 -04:00
Lucas Bickel
8253a070f4
Update name in ref_off_air_meta in Liquidsoap
2017-04-16 01:23:40 +02:00
Lucas Bickel
007ff5561c
Pass debug flag to python logger as well
2017-04-15 23:27:04 +02:00
Robbt
b12d132aab
removed hardcoded include of pervasives.liq
2017-04-03 19:54:18 -04:00
Lucas Bickel
acdc529139
Do not bundle liquidsoap library
...
I think the code was bundled into legacy upstream before it was
readily available in liquidsoap proper. These snippets are now
maintained at https://github.com/savonet/liquidsoap/tree/master/scripts .
On all distros I checked these scripts are installed to /usr/bin/liquidsoap
by the corresponding package. Liquidsoap loads them from there by
default.
By not bundling this we will be ready to profit from new features and
bugfixes in liquidsoap that is expected to land on opam soon. We'll
need to figure out how to get debian and others updated when that
happens.
2017-03-28 12:26:11 +02:00
Lucas Bickel
b267036483
Fix recording through ecasound
...
This is part 2 of fixing ecasound recordings from line-in. Part 1 restored the User-Interface, part 2 takes care of getting to the point where ecasound gets started, records something and uploads it through rest when done. Part 3 will take care of making sure that the recorded file is mapped to the show and not just stored as a new track.
I refactored api_clients to not use urllib2 for posting multipart data since I was loosing my sanity over it and requests seems to have a modern approach to doing this compared to what api_clients was previously doing.
2017-03-24 15:15:37 +01:00
Lucas Bickel
5f04dbb8a8
Get base_recorder_file config from proper subsection in conf
...
It took me way too long to figure this one out it wasn't logging nicely. With this ecasound actually gets called again. It's still failing on my install but I'm not yet sure why exactly.
2017-03-23 13:18:52 +01:00
Lucas Bickel
c6225f9db5
Reverse pypo changes
...
The TODO seems to have been wrong due to the fact that everything works as advertised w/0 the change.
2017-03-19 13:15:59 +01:00
Robb Ebright
1b90dbd4ca
working python liquidsoap reconfigure script, might need further refinement
2017-03-14 04:02:51 +00:00
Robb Ebright
67ffd2d34a
Making show and master source ports and mount points editable.
2017-03-14 01:15:14 +00:00
Robb
479bdb1c80
Merge pull request #76 from radiorabe/feature/no-more-std_err_override-for-pypo
...
Problem: std_err_override is a hack for python < 2.7
2017-03-13 14:44:01 -04:00
Lucas Bickel
dfe3f077fd
Replace std_err_override with logging.captureWarnings(True) in pypo
...
The quite ugly hack with std_err_override seems to have been made for python < 2.7. Since all major distros
have al least python 2.7 installed we can stop using the std_err_override hack.
This removes it from pypo, media-monitor still uses the module and we can completely delete it when we have
remove media-monitor after having maybe backported the watched folders feature to analyzer.
2017-03-13 16:28:07 +01:00
Lucas Bickel
99a0ce37cc
Fix fix_cue_in to work with liquidsoap 1.2
...
The previous syntax only worked with 1.1, this one should work on both.
2017-03-13 14:30:51 +01:00
Kirill Kadoshnikov
0775bc4f59
Correction lines 399 and 400. ls_script.liq
...
Lines 399 and 400. Changed the values of s3_name and s3_description places.
(Because of this error, the Icecast confused the name and description of the flow)
_______________________
Строки 399 и 400. Поменял значения s3_name и s3_description местами. (Из-за этой ошибки Icecast путал название и описание потока)
_______________________
Sorry for my clumsy translation, I'm from Russia
2017-03-12 20:03:30 +04:00
Lucas Bickel
ac5f608bd8
Refactor into def check_version
...
Make the code more readable :)
2017-03-12 14:18:06 +01:00
Lucas Bickel
80373ca7bc
cue_cut workaround
...
This is the workaround for <https://github.com/savonet/liquidsoap/issues/390 >.
I still need to do proper testing on it and maybe we should figure out the proper "formula" for getting to the 0.04 value.
2017-03-12 14:18:06 +01:00
Lucas Bickel
0e8d0868e8
Make pypo media downloader port aware
...
This is needed if the base port is not 80 like in the vagrant setup.
2017-03-10 19:10:15 +01:00
Albert Santoni
a26f1a70e3
Respawn liquidsoap and pypo indefinitely if they fail to launch. Throttled it though.
2015-12-04 15:56:06 -05:00
Albert Santoni
91e1252b86
SAAS-1239: Listener stats with Shoutcast not working
2015-12-04 15:05:17 -05:00
Albert Santoni
2eea558dfd
SAAS-1267: AAC streams stuck at 64 kbps, even at higher bitrates
2015-12-04 10:51:07 -05:00
Albert Santoni
bb05fa996a
SAAS-1132: Improve safety of XML parsing for listener stats
2015-11-09 19:32:56 -05:00
Albert Santoni
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
Albert Santoni
f21fcb3dcc
SAAS-1011 - Fixed one mimetype problem and fixed installer
2015-08-24 16:25:09 -04:00
Albert Santoni
fdb2d4fae2
SAAS-1011: Files on NFS with incorrect file extensions won't play out
...
* Simplified the mime type detection code in pypo and made it actually work
2015-08-24 11:29:45 -04:00
Albert Santoni
dab0f00736
Fixed m4a file extension mapping in pypo
2015-08-11 08:59:44 -04:00
Duncan Sommerville
1816be156f
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
2015-07-16 16:26:52 -04:00
Albert Santoni
238bb15793
SAAS-941: Liquidsoap fails to start for stations with the substrings true/false in their names
2015-07-09 22:32:34 -04:00
Duncan Sommerville
dd2ffd148d
Fix bug where pypo fails to restart liquidsoap; uncomment adding pypo template files
2015-06-29 12:20:39 -04:00
Duncan Sommerville
d9f17f3919
SAAS-871 - Fix consumer cancellation bug
2015-06-26 17:11:04 -04:00
Albert Santoni
d54eb37317
Merge branch 'saas' into saas-dev
2015-06-24 15:19:38 -04:00
Albert Santoni
195935cccf
Slightly better exception handling and logging to help with SAAS-884
2015-06-22 15:49:23 -04:00
Duncan Sommerville
92ad5bde6d
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
2015-06-17 14:49:12 -04:00
Albert Santoni
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
Albert Santoni
146146e35f
CC-6052: Fix problem with stream passwords
2015-06-08 14:18:19 -04:00
Albert Santoni
01ea6f27ae
Merge branch 'saas-dev' into saas-installer-albert
...
Conflicts:
python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
Albert Santoni
700fddbada
SAAS-818: If the network connection is interrupted, pypo sometimes can't recover
2015-06-02 14:51:20 -04:00
drigato
532bd1ea85
SAAS-772: Send metadata to Tunein
...
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
Albert Santoni
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
Albert Santoni
fc02de4920
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 415a0d21f9
.
2015-05-22 19:09:04 -04:00
Albert Santoni
d3f89c9507
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 82c801cb79
.
2015-05-22 19:08:48 -04:00
Albert Santoni
9ffbdfbfa3
Merge branch '2.5.x-installer' into saas-installer-albert
2015-05-22 18:43:28 -04:00
Albert Santoni
b81069ace3
Added missing requests dependency to pypo's requirements
2015-05-22 18:43:05 -04:00
Albert Santoni
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
Albert Santoni
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
Albert Santoni
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
Duncan Sommerville
196e08fc90
Fix bug where users can't connect to Master source due to hardcoded path in liquidsoap
2015-05-21 12:49:26 -04:00
Duncan Sommerville
415a0d21f9
Add on_metadata wrapper to liquidsoap master/show sources
2015-05-15 15:46:45 -04:00
Duncan Sommerville
82c801cb79
Add on_metadata wrapper to liquidsoap master/show sources
2015-05-15 15:15:49 -04:00
drigato
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
Albert Santoni
cca9ba0c36
Fixed pypo config file loading
2015-03-12 19:09:00 -04:00
Albert Santoni
b49e98693b
Ignore artist_name and track_titles that aren't strings (fixes playout
...
for empty artist name or track titles)
2015-03-12 10:52:28 -04:00
Albert Santoni
a29d464eb2
SAAS-642: Files with doublequotes in their track titles fail to playout
...
(pypo->LS communication bug)
* Fixed it by escaping the command
2015-03-11 18:34:50 -04:00
Albert Santoni
0042fb50fe
Refactor some stuff related to four streams, Liquidsoap is a piece of
...
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
Albert Santoni
6232e3f4f0
Better backwards compatibility fix for 4 streams
2015-03-10 12:52:00 -04:00
Albert Santoni
968b739bf4
Make 4th stream backwards compatible with the autogenerated
...
liquidsoap.cfg
2015-03-10 12:41:45 -04:00
Albert Santoni
d61b75f105
Added a working 4th stream
2015-03-03 16:08:53 -05:00
Albert Santoni
0b1af01822
Better exception logging and small pypo exception fix
2015-02-26 13:52:51 -05:00
drigato
38aa1d1cd9
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-24 16:44:17 -05:00
drigato
d843de80cc
Remove log statements
2015-02-24 16:22:20 -05:00
drigato
6113dff182
Debugging logs
2015-02-24 15:19:46 -05:00
drigato
86ba5c547e
SAAS-596: Store file size and hash in database
...
Fixed exception handling in pypo
2015-02-24 12:32:46 -05:00
Albert Santoni
b2a2153572
Merge branch '2.5.x' into saas
2015-02-24 12:04:11 -05:00
Albert Santoni
8a88b4b733
Reduce the pypo POLL_INTERVAL to lessen impact of RabbitMQ or web server outages
2015-02-24 12:03:35 -05:00
drigato
be7a6854f0
SAAS-596: Store file size and hash in database
...
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
2015-02-24 11:00:41 -05:00
Daniel James
72f79d0f90
Debian/Ubuntu require a force-reload option for sysvinit scripts
2015-02-24 14:57:28 +00:00
Daniel James
4b850a5675
More permissions tweaks for Debian/Ubuntu compliance
2015-02-24 14:16:44 +00:00
Albert Santoni
1a8883b91d
Merge branch '2.5.x-installer' of github.com:sourcefabric/Airtime into 2.5.x-installer
2015-02-23 12:50:43 -05:00
Daniel James
071715415b
Fix permissions on files for Debian/Ubuntu compliance
2015-02-23 17:41:56 +00:00
Albert Santoni
a2d8da617d
Fixed everything about Airtime on Debian
...
* Added sysvinit scripts back in and cleaned them up
* service status now works correctly for all services
* Moved logging config files into install/ folders for the python_apps
* Fixed some small setup.py problems in the various python_apps
* Gave each python app a better bin/ script which doesn't fork, which lets
service status work automagically.
2015-02-13 16:06:59 -05:00
Albert Santoni
bbcd4fbe2e
Tons of bugfixes for the installer on Debian
...
* Still need to get pypo working with sysvinit
* Still need to fix this logger.cfg silliness with pypo and
media_monitor
2015-02-13 11:32:07 -05:00
Albert Santoni
d46f4a52eb
Installer tweaks and a pypo bugfix
...
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
drigato
93da48351c
Deleted old, unused cloud_storage_downloader.py file from pypo
2015-01-29 14:29:59 -05:00
Duncan Sommerville
b673017bfd
Fix to setuptools deployment of pyponotify and liquidsoap
2015-01-28 15:09:13 -05:00
Duncan Sommerville
bc604b992e
CC-5986 - Fixed unit tests, removed unnecessary code from service execution files
2015-01-28 13:19:50 -05:00
Duncan Sommerville
875a9dfd8b
CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime
2015-01-27 18:43:36 -05:00
Albert Santoni
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville
4552089c19
Fixes to install & uninstall procedure
2015-01-15 17:33:47 -05:00
Duncan Sommerville
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -05:00
Duncan Sommerville
19a1817159
Fix a bad reversion in the airtime-playout binary
2015-01-15 10:12:52 -05:00
Duncan Sommerville
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
drigato
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
Duncan Sommerville
674b8c69e4
Add very basic uninstall script, move install script to root directory
2015-01-12 16:13:39 -05:00
Duncan Sommerville
0fcac545e6
For now, just prompt users to start background services at the end of the install process
2015-01-12 10:53:31 -05:00
Duncan Sommerville
bf1355a203
Yet another attempt to run upstart jobs as unprivileged user
2015-01-12 09:48:08 -05:00
Duncan Sommerville
e568013db6
More work on running services as web user
2015-01-08 13:21:08 -05:00
Duncan Sommerville
ab35827439
Different approach for running airtime services as unprivileged user
2015-01-08 12:56:09 -05:00
Duncan Sommerville
a790527e67
More work on running upstart services as non-privileged user
2015-01-08 10:06:37 -05:00
Duncan Sommerville
a9a59337b8
More work on running upstart services as non-privileged user
2015-01-07 16:31:30 -05:00
Duncan Sommerville
e6d8a6f25e
Move upstart .conf files to directory accessible by non-privileged users
2015-01-07 16:04:48 -05:00
Duncan Sommerville
0fef350e9d
Fixed issue with liquidsoap service starting as daemon, fixed logging issue in pypocli
2015-01-07 14:25:24 -05:00
drigato
ad16683858
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-07 14:17:02 -05:00
drigato
9d6cf8620f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-07 14:16:09 -05:00
drigato
e5c806f658
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2015-01-07 14:13:36 -05:00
Duncan Sommerville
05c2ecdb89
Changed logger init to use paths relative to current file
2015-01-07 11:46:06 -05:00
Albert Santoni
3225fcc6bc
Fix syntax errors in fdkaac.liq
2015-01-07 11:35:43 -05:00
Duncan Sommerville
5e8c4b112f
More work on getting services working with new installer
2015-01-07 10:54:17 -05:00
Duncan Sommerville
8e6e72a501
More work on getting services working with new installer
2015-01-07 10:31:00 -05:00
Duncan Sommerville
c66e6aa849
More work on getting services working with new installer
2015-01-07 10:01:32 -05:00
Albert Santoni
fc912923ce
Force the use of FDK-AAC and significantly boost AAC sound quality
2015-01-06 12:58:11 -05:00
Duncan Sommerville
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
Duncan Sommerville
bbc095f534
Added virtualenv back into install process
2015-01-05 15:38:01 -05:00
Duncan Sommerville
5f137d99a3
Added virtualenv back into install process
2015-01-05 14:42:53 -05:00
Duncan Sommerville
fc68dfa256
Fixed service execution calls
2015-01-05 11:16:58 -05:00
Duncan Sommerville
ee96380a41
Test to start upstart jobs as web user
2015-01-05 10:16:44 -05:00
Duncan Sommerville
f35fb4968c
Test to start upstart jobs as web user
2015-01-05 09:47:06 -05:00
Duncan Sommerville
344e1aa194
Test to start upstart jobs as web user
2015-01-05 09:30:08 -05:00
Duncan Sommerville
75c2a4a18b
More work on media-monitor and pypo install process
2014-12-19 13:49:33 -05:00
Duncan Sommerville
6bc3a1cfba
More work on switching pypo to use setuptools, added lxc-bootstrap script for ease of testing across distros
2014-12-19 09:47:54 -05:00
drigato
28a06136aa
Better error logging when pypo downloads files
2014-12-17 18:30:06 -05:00
Duncan Sommerville
4749ef111c
More work on switching pypo to use setuptools
2014-12-17 17:05:55 -05:00
Duncan Sommerville
29917ebf63
More work on switching pypo to use setuptools
2014-12-17 16:42:29 -05:00
Duncan Sommerville
97805ad271
Removed many unnecessary files and started changing pypo to use setuptools
2014-12-17 16:22:40 -05:00
Duncan Sommerville
eefe8910cf
More work on monitless installer
2014-12-16 21:27:37 -05:00
Duncan Sommerville
51a95fb989
More work on monitless installer
2014-12-16 20:12:20 -05:00
Duncan Sommerville
8a2c155289
More work on monitless installer
2014-12-16 19:42:07 -05:00
Duncan Sommerville
ad4b61e89f
More work on monitless installer
2014-12-16 19:05:17 -05:00
Duncan Sommerville
4043ebfd25
More work on monitless installer
2014-12-16 16:26:58 -05:00
Duncan Sommerville
8a353f970c
More work on monitless installer
2014-12-16 15:45:35 -05:00
Duncan Sommerville
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
drigato
aabe3799b1
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-15 12:49:41 -05:00
drigato
6de8bbe967
SAAS-514: PYPO -> Tracks may not become ready in time for playout
2014-12-15 12:27:51 -05:00
Albert Santoni
d5fc90e9d3
Merge branch '2.5.x' into saas
2014-12-15 10:50:25 -05:00
Albert Santoni
8766519c71
Another tweak to Opus sound quality. Liquidsoap picks undocumented poor
...
defaults for almost every encoder.
2014-12-15 10:49:21 -05:00
Albert Santoni
3b88b0ce22
Boost the Opus sound quality
2014-12-15 10:42:45 -05:00
drigato
7b80915c16
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-12 09:44:54 -05:00
drigato
29d3d877ab
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/setup.py
2014-12-12 09:36:27 -05:00
Albert Santoni
3b1c776879
Removed all ReplayGain and Silan stuff from pypo, plus a bugfix
...
* Ripped out all the ReplayGain and Silan analysis from pypo, since
it's now implemented in airtime_analyzer. This fixes a bunch of
race conditions.
* Also renamed the replaygain field to replay_gain in airtime_analyzer
to match Airtime.
2014-12-11 14:26:05 -05:00
drigato
89925e52ed
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
drigato
ec189fc27a
SAAS-509: PYPO can't download files via the REST API
2014-12-08 15:33:02 -05:00
drigato
2c760f4ba6
Changed how PYPO's download URL is created
2014-12-08 14:47:23 -05:00
drigato
687548ec68
Adding some logging statements
2014-12-08 14:24:19 -05:00
drigato
024150f023
SAAS-503: PYPO -> Use the REST API to download files
...
Fixed disabling SSL verication
2014-12-03 14:50:58 -05:00
drigato
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
drigato
e1f1807f5a
SAAS-503: PYPO -> Use the REST API to download files
...
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
drigato
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
drigato
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
drigato
90ff323d1d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 14:00:37 -05:00
drigato
dbc55632e1
Changed print statements so they go to the pypo log
2014-11-11 13:58:55 -05:00
drigato
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
drigato
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
drigato
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
drigato
7e1d14fcf2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-11-03 10:31:49 -05:00
drigato
52b0db5ccd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-11-03 10:29:53 -05:00
Duncan Sommerville
ef9ab1acf0
Merge branch '2.5.x' into saas
2014-10-30 17:42:55 -04:00
Duncan Sommerville
8f5af6556d
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
2014-10-30 17:41:00 -04:00
drigato
01ad2ab832
Commented cloud storage classes
2014-10-29 17:42:42 -04:00