github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-14 01:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fallback directories to data dir

Browse source
This commit is contained in:
JonnyWong16 2018-09-08 23:16:14 -07:00
parent 955dc795ff
commit cd6289046e
1 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

73
plexpy/__init__.py
View file

@ -140,21 +140,13 @@ def initialize(config_file):
if not CONFIG.HTTPS_KEY: if not CONFIG.HTTPS_KEY:
CONFIG.HTTPS_KEY = os.path.join(DATA_DIR, 'server.key') CONFIG.HTTPS_KEY = os.path.join(DATA_DIR, 'server.key')
if not CONFIG.LOG_DIR: CONFIG.LOG_DIR, log_writable = check_folder_writable(
CONFIG.LOG_DIR = os.path.join(DATA_DIR, 'logs') CONFIG.LOG_DIR, os.path.join(DATA_DIR, 'logs'), 'logs')
if not log_writable and not QUIET:
if not os.path.exists(CONFIG.LOG_DIR): sys.stderr.write("Unable to create the log directory. Logging to screen only.\n")
try:
os.makedirs(CONFIG.LOG_DIR)
except OSError:
CONFIG.LOG_DIR = None
if not QUIET:
sys.stderr.write("Unable to create the log directory. " \
"Logging to screen only.\n")
# Start the logger, disable console if needed # Start the logger, disable console if needed
logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR, logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR if log_writable else None,
verbose=VERBOSE) verbose=VERBOSE)
logger.info(u"Starting Tautulli {}".format( logger.info(u"Starting Tautulli {}".format(
@ -177,29 +169,12 @@ def initialize(config_file):
DB_FILE DB_FILE
)) ))
if not CONFIG.BACKUP_DIR: CONFIG.BACKUP_DIR, _ = check_folder_writable(
CONFIG.BACKUP_DIR = os.path.join(DATA_DIR, 'backups') CONFIG.BACKUP_DIR, os.path.join(DATA_DIR, 'backups'), 'backups')
if not os.path.exists(CONFIG.BACKUP_DIR): CONFIG.CACHE_DIR, _ = check_folder_writable(
try: CONFIG.CACHE_DIR, os.path.join(DATA_DIR, 'cache'), 'cache')
os.makedirs(CONFIG.BACKUP_DIR) CONFIG.NEWSLETTER_DIR, _ = check_folder_writable(
except OSError as e: CONFIG.NEWSLETTER_DIR, os.path.join(DATA_DIR, 'newsletters'), 'newsletters')
logger.error(u"Could not create backup dir '%s': %s" % (CONFIG.BACKUP_DIR, e))
if not CONFIG.CACHE_DIR:
CONFIG.CACHE_DIR = os.path.join(DATA_DIR, 'cache')
if not os.path.exists(CONFIG.CACHE_DIR):
try:
os.makedirs(CONFIG.CACHE_DIR)
except OSError as e:
logger.error(u"Could not create cache dir '%s': %s" % (CONFIG.CACHE_DIR, e))
if not CONFIG.NEWSLETTER_DIR:
CONFIG.NEWSLETTER_DIR = os.path.join(DATA_DIR, 'newsletters')
if not os.path.exists(CONFIG.NEWSLETTER_DIR):
try:
os.makedirs(CONFIG.NEWSLETTER_DIR)
except OSError as e:
logger.error(u"Could not create newsletter dir '%s': %s" % (CONFIG.NEWSLETTER_DIR, e))
# Initialize the database # Initialize the database
logger.info(u"Checking if the database upgrades are required...") logger.info(u"Checking if the database upgrades are required...")
@ -1974,3 +1949,29 @@ def analytics_event(category, action, label=None, value=None, **kwargs):
TRACKER.send('event', data) TRACKER.send('event', data)
except Exception as e: except Exception as e:
logger.warn(u"Failed to send analytics event for category '%s', action '%s': %s" % (category, action, e)) logger.warn(u"Failed to send analytics event for category '%s', action '%s': %s" % (category, action, e))
def check_folder_writable(folder, fallback, name):
if not folder:
folder = fallback
if not os.path.exists(folder):
try:
os.makedirs(folder)
except OSError as e:
logger.error(u"Could not create %s dir '%s': %s" % (name, folder, e))
if folder != fallback:
logger.warn(u"Falling back to %s dir '%s'" % (name, fallback))
return check_folder_writable(None, fallback, name)
else:
return folder, None
if not os.access(folder, os.W_OK):
logger.error(u"Cannot write to %s dir '%s'" % (name, folder))
if folder != fallback:
logger.warn(u"Falling back to %s dir '%s'" % (name, fallback))
return check_folder_writable(None, fallback, name)
else:
return folder, False
return folder, True