#!/usr/bin/env python
-# Logging functions
-# Copyright (C) 2001, 2002 James Troup <james@nocrew.org>
-# $Id: logging.py,v 1.4 2005-11-15 09:50:32 ajt Exp $
+"""
+Logging functions
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2001, 2002, 2006 James Troup <james@nocrew.org>
+@license: GNU General Public License version 2 or later
+"""
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
################################################################################
-import os, pwd, time, sys
+import os
+import pwd
+import time
+import sys
import utils
################################################################################
if not os.path.exists(logdir):
umask = os.umask(00000)
os.makedirs(logdir, 02775)
+ os.umask(umask)
# Open the logfile
logfilename = "%s/%s" % (logdir, time.strftime("%Y-%m"))
- logfile = None
- if debug:
- logfile = sys.stderr
- else:
- logfile = utils.open_file(logfilename, 'a')
+ logfile = None
+ if debug:
+ logfile = sys.stderr
+ else:
+ umask = os.umask(00002)
+ logfile = utils.open_file(logfilename, 'a')
+ os.umask(umask)
self.logfile = logfile
# Log the start of the program
user = pwd.getpwuid(os.getuid())[0]
timestamp = time.strftime("%Y%m%d%H%M%S")
details.insert(0, timestamp)
# Force the contents of the list to be string.join-able
- details = map(str, details)
+ details = [ str(i) for i in details ]
# Write out the log in TSV
self.logfile.write("|".join(details)+'\n')
# Flush the output to enable tail-ing