X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fsfalogging.py;h=75229b3828f030aacff306b679593d268d1f539f;hb=db88e8be755e4a4c17fcd65eec98ca420eff91a4;hp=3991d338dbe405917bf355a3161103bcba7b67a8;hpb=a8007ffe1b28614b26f03e4537659b1234003f2d;p=sfa.git

diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py
index 3991d338..75229b38 100644
--- a/sfa/util/sfalogging.py
+++ b/sfa/util/sfalogging.py
@@ -28,7 +28,16 @@ class _SfaLogger:
             # This is usually a permissions error becaue 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)
-            handler=logging.handlers.RotatingFileHandler(tmplogfile,maxBytes=1000000, backupCount=5) 
+            # 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)
+            # just log to the console in that case.
+            # Here we default to the console.
+            if os.path.exists(tmplogfile) and not os.access(tmplogfile,os.W_OK):
+                loggername = loggername + "-console"
+                handler = logging.StreamHandler()
+            else:
+                handler=logging.handlers.RotatingFileHandler(tmplogfile,maxBytes=1000000, backupCount=5) 
         handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s"))
         self.logger=logging.getLogger(loggername)
         self.logger.setLevel(level)
@@ -71,6 +80,10 @@ class _SfaLogger:
         
     def warn(self, msg):
         self.logger.warn(msg)
+
+    # some code is using logger.warn(), some is using logger.warning()
+    def warning(self, msg):
+        self.logger.warning(msg)
    
     def error(self, msg):
         self.logger.error(msg)    
@@ -90,8 +103,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")
@@ -134,26 +147,29 @@ def profile(logger):
 
 if __name__ == '__main__': 
     print 'testing sfalogging into logger.log'
-    logger=_SfaLogger('logger.log')
-    logger2=_SfaLogger('logger.log', level=logging.DEBUG)
-    logger3=_SfaLogger('logger.log', level=logging.ERROR)
-    print logger.logger.handlers
+    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
    
-    logger.critical("logger.critical")
-    logger.error("logger.error")
-    logger.warn("logger.warning")
-    logger.info("logger.info")
-    logger.debug("logger.debug")
-    logger.setLevel(logging.DEBUG)
-    logger.debug("logger.debug again")
+        logger.enable_console()
+        logger.critical("logger.critical")
+        logger.error("logger.error")
+        logger.warn("logger.warning")
+        logger.info("logger.info")
+        logger.debug("logger.debug")
+        logger.setLevel(logging.DEBUG)
+        logger.debug("logger.debug again")
     
-
-    @profile(logger)
-    def sleep(seconds = 1):
-        time.sleep(seconds)
-
-    logger.info('console.info')
-    sleep(0.5)
-    logger.setLevel(logging.DEBUG)
-    sleep(0.25)
+        @profile(logger)
+        def sleep(seconds = 1):
+            time.sleep(seconds)
+
+        logger.info('console.info')
+        sleep(0.5)
+        logger.setLevel(logging.DEBUG)
+        sleep(0.25)