From ec8115828ae0214a949d9271a8a2c3e37e4a5b12 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 24 Apr 2012 16:24:54 -0400 Subject: [PATCH] CC-3673: media monitor encoding problem -made media-monitor not start if non UTF-8 encoding detected. --- python_apps/media-monitor/MediaMonitor.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py index 3fa9fe912..bcf9a0a3b 100644 --- a/python_apps/media-monitor/MediaMonitor.py +++ b/python_apps/media-monitor/MediaMonitor.py @@ -5,6 +5,7 @@ import sys import os import signal import traceback +import locale from api_clients import api_client as apc from std_err_override import LogWriter @@ -38,7 +39,16 @@ except Exception, e: logger.info("\n\n*** Media Monitor bootup ***\n\n") + try: + fs_encoding = locale.getdefaultlocale()[1].lower() + if fs_encoding not in ['utf-8', 'utf8']: + logger.error("Filesystem encoding needs to be UTF-8. Currently '%s'. Exiting..." % fs_encoding) + sys.exit(1) + else: + logger.debug("Filesystem encoding: '%s'" % fs_encoding) + + config = AirtimeMediaConfig(logger) api_client = apc.api_client_factory(config.cfg) api_client.register_component("media-monitor")