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

CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions. 

-fix silly regression
This commit is contained in:
Martin Konecny 2012-05-07 14:39:54 -04:00
parent 1d245ed79d
commit ece93ac054
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View File

@ -134,7 +134,7 @@ class AirtimeProcessEvent(ProcessEvent):
#file is being overwritten/replaced in GUI. #file is being overwritten/replaced in GUI.
elif "goutputstream" in pathname: elif "goutputstream" in pathname:
self.temp_files[pathname] = None self.temp_files[pathname] = None
elif self.mmc.is_audio_file(pathname): elif self.mmc.is_audio_file(name):
if self.mmc.is_parent_directory(pathname, self.config.organize_directory): if self.mmc.is_parent_directory(pathname, self.config.organize_directory):
#file was created in /srv/airtime/stor/organize. Need to process and move #file was created in /srv/airtime/stor/organize. Need to process and move
@ -150,10 +150,10 @@ class AirtimeProcessEvent(ProcessEvent):
except Exception, e: except Exception, e:
self.logger.error('Exception: %s', e) self.logger.error('Exception: %s', e)
self.logger.error("traceback: %s", traceback.format_exc()) self.logger.error("traceback: %s", traceback.format_exc())
else: return
#ensure file is world readable (Liquidsoap and Web UI preview)
is_recorded = self.mmc.is_parent_directory(pathname, self.config.recorded_directory) is_recorded = self.mmc.is_parent_directory(pathname, self.config.recorded_directory)
self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': pathname, 'is_recorded_show': is_recorded}) self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': pathname, 'is_recorded_show': is_recorded})
def process_IN_MODIFY(self, event): def process_IN_MODIFY(self, event):

2
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
View File

@ -314,7 +314,7 @@ class MediaMonitorCommon:
self.logger.debug("Moving from %s to %s", pathname, filepath) self.logger.debug("Moving from %s to %s", pathname, filepath)
self.move_file(pathname, filepath) self.move_file(pathname, filepath)
if not self.mmc.make_readable(filepath): if not self.make_readable(filepath):
self.logger.warn("Couldn't make filepath %s readable", pathname) self.logger.warn("Couldn't make filepath %s readable", pathname)
filepath = None filepath = None
else: else: