+#!/usr/bin/env python
+
# Logging functions
-# Copyright (C) 2001 James Troup <james@nocrew.org>
-# $Id: logging.py,v 1.1 2001-07-07 03:59:45 troup Exp $
+# Copyright (C) 2001, 2002 James Troup <james@nocrew.org>
+# $Id: logging.py,v 1.4 2005-11-15 09:50:32 ajt Exp $
# 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
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+
################################################################################
-import os, pwd, string, time
-import utils
+import os, pwd, time, sys;
+import utils;
################################################################################
logfile = None;
program = None;
- def __init__ (self, Cnf, program):
+ def __init__ (self, Cnf, program, debug=0):
"Initialize a new Logger object"
self.Cnf = Cnf;
self.program = program;
# Create the log directory if it doesn't exist
- logdir = Cnf["Dir::LogDir"];
+ logdir = Cnf["Dir::Log"];
if not os.path.exists(logdir):
umask = os.umask(00000);
os.makedirs(logdir, 02775);
# Open the logfile
- logfilename = "%s/%s" % (logdir, time.strftime("%Y-%m", time.localtime(time.time())));
- logfile = utils.open_file(logfilename, 'a');
- # Seek to the end of the logfile
- logfile.seek(0,2);
+ logfilename = "%s/%s" % (logdir, time.strftime("%Y-%m"));
+ logfile = None
+ if debug:
+ logfile = sys.stderr
+ else:
+ logfile = utils.open_file(logfilename, 'a');
self.logfile = logfile;
# Log the start of the program
user = pwd.getpwuid(os.getuid())[0];
"Log an event"
# Prepend the timestamp and program name
details.insert(0, self.program);
- timestamp = time.strftime("%Y%m%d%H%M%S", time.localtime(time.time()));
+ 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);
# Write out the log in TSV
- self.logfile.write(string.join(details, '~')+'\n');
+ self.logfile.write("|".join(details)+'\n');
# Flush the output to enable tail-ing
self.logfile.flush();