X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fsfalogging.py;h=2b73b48d26c7d9d1eac4925691d906655677c5e4;hb=fad16c7d54b658b37a9b42fbee47b0d4f51cb8ec;hp=3c7eee603ddf807cc6b207cd00aa5d1023c11e71;hpb=ec8962121ddaa6f681f3bb09db1787b16580c352;p=sfa.git

diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py
index 3c7eee60..2b73b48d 100644
--- a/sfa/util/sfalogging.py
+++ b/sfa/util/sfalogging.py
@@ -1,5 +1,30 @@
 #!/usr/bin/python
 
+#----------------------------------------------------------------------
+# Copyright (c) 2008 Board of Trustees, Princeton University
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS 
+# IN THE WORK.
+#----------------------------------------------------------------------
+
+from __future__ import print_function
+
 import os, sys
 import traceback
 import logging, logging.handlers
@@ -25,9 +50,15 @@ class _SfaLogger:
         try:
             handler=logging.handlers.RotatingFileHandler(logfile,maxBytes=1000000, backupCount=5) 
         except IOError:
-            # This is usually a permissions error becaue the file is
+            # This is usually a permissions error because the file is
             # owned by root, but httpd is trying to access it.
-            tmplogfile=os.getenv("TMPDIR", "/tmp") + os.path.sep + os.path.basename(logfile)
+            tmplogfile=os.path.join(os.getenv("TMPDIR", os.getenv("TMP", os.path.normpath("/tmp"))), os.path.basename(logfile))
+            tmplogfile = os.path.normpath(tmplogfile)
+
+            tmpdir = os.path.dirname(tmplogfile)
+            if tmpdir and tmpdir != "" and not os.path.exists(tmpdir):
+                os.makedirs(tmpdir)
+
             # In strange uses, 2 users on same machine might use same code,
             # meaning they would clobber each others files
             # We could (a) rename the tmplogfile, or (b)
@@ -60,6 +91,9 @@ class _SfaLogger:
     def setLevelDebug(self):
         self.logger.setLevel(logging.DEBUG)
 
+    def debugEnabled (self):
+        return self.logger.getEffectiveLevel() == logging.DEBUG
+
     # define a verbose option with s/t like
     # parser.add_option("-v", "--verbose", action="count", dest="verbose", default=0)
     # and pass the coresponding options.verbose to this method to adjust level
@@ -68,8 +102,13 @@ class _SfaLogger:
             self.logger.setLevel(logging.WARNING)
         elif verbose==1:
             self.logger.setLevel(logging.INFO)
-        elif verbose==2:
+        elif verbose>=2:
             self.logger.setLevel(logging.DEBUG)
+    # in case some other code needs a boolean
+    def getBoolVerboseFromOpt(self,verbose):
+        return verbose>=1
+    def getBoolDebugFromOpt(self,verbose):
+        return verbose>=2
 
     ####################
     def info(self, msg):
@@ -103,8 +142,8 @@ class _SfaLogger:
     # for investigation purposes, can be placed anywhere
     def log_stack(self,message):
         to_log="".join(traceback.format_stack())
-        self.debug("%s BEG STACK"%message+"\n"+to_log)
-        self.debug("%s END STACK"%message)
+        self.info("%s BEG STACK"%message+"\n"+to_log)
+        self.info("%s END STACK"%message)
 
     def enable_console(self, stream=sys.stdout):
         formatter = logging.Formatter("%(message)s")
@@ -146,14 +185,14 @@ def profile(logger):
 
 
 if __name__ == '__main__': 
-    print 'testing sfalogging into logger.log'
+    print('testing sfalogging into logger.log')
     logger1=_SfaLogger('logger.log', loggername='std(info)')
     logger2=_SfaLogger('logger.log', loggername='error', level=logging.ERROR)
     logger3=_SfaLogger('logger.log', loggername='debug', level=logging.DEBUG)
     
     for (logger,msg) in [ (logger1,"std(info)"),(logger2,"error"),(logger3,"debug")]:
         
-        print "====================",msg, logger.logger.handlers
+        print("====================",msg, logger.logger.handlers)
    
         logger.enable_console()
         logger.critical("logger.critical")